Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv22949
Modified Files:
ChangeLog PkgVersion.pm
Log Message:
When moving files for the Files field, only create each target directory
once, not for every file moved
Index: PkgVersion.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/PkgVersion.pm,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -d -r1.549 -r1.550
--- PkgVersion.pm 19 Apr 2006 16:39:11 -0000 1.549
+++ PkgVersion.pm 26 Apr 2006 03:08:39 -0000 1.550
@@ -3368,10 +3368,10 @@
"Files of ".$self->get_fullname()." in
".$self->get_info_filename
);
- my (@files, $file, $source, $target, $target_dir);
+ my %target_dirs = (); # keys are dirs that have already been
created
- @files = split(/\s+/, $files);
- foreach $file (@files) {
+ foreach my $file (split /\s+/, $files) {
+ my ($source, $target);
$file =~ s/\%/\%\%/g; # reprotect for later
%-expansion
if ($file =~ /^(.+)\:(.+)$/) {
$source = $1;
@@ -3394,8 +3394,10 @@
$target = "%i/$target";
}
- $target_dir = dirname($target);
- $install_script .= "\n/usr/bin/install -d -m 755
$target_dir";
+ my $target_dir = dirname($target);
+ if (!$target_dirs{$target_dir}++) {
+ $install_script .= "\n/usr/bin/install -d -m
755 $target_dir";
+ }
$install_script .= "\n/bin/mv $source $target_dir/";
}
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1321
retrieving revision 1.1322
diff -u -d -r1.1321 -r1.1322
--- ChangeLog 20 Apr 2006 14:18:43 -0000 1.1321
+++ ChangeLog 26 Apr 2006 03:08:39 -0000 1.1322
@@ -1,4 +1,8 @@
-2006-04-20 Alexander Hansen <[EMAIL PROTECTED]>
+2006-04-25 Daniel Macks <[EMAIL PROTECTED]>
+
+ * PkgVersion.pm: Don't mkdir the Files target dir for every file copied
+
+2006-04-20 Alexander Hansen <[EMAIL PROTECTED]>
* Bootstrap.pm: Add 10.4.6 to supported OS flavors.
-------------------------------------------------------
Using Tomcat but need to do more? Need to support web services, security?
Get stuff done quickly with pre-integrated technology to make your job easier
Download IBM WebSphere Application Server v.1.0.1 based on Apache Geronimo
http://sel.as-us.falkag.net/sel?cmd=lnk&kid=120709&bid=263057&dat=121642
_______________________________________________
Fink-commits mailing list
Fink-commits@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/fink-commits
