Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv21529
Modified Files:
ChangeLog Validation.pm
Log Message:
Fix to catch .dylib in forbidden dir.
Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.132
retrieving revision 1.133
diff -u -d -r1.132 -r1.133
--- Validation.pm 25 Jun 2004 20:54:22 -0000 1.132
+++ Validation.pm 27 Jul 2004 06:18:04 -0000 1.133
@@ -825,7 +825,14 @@
next if (($filename eq
"/Applications/") || ($filename eq "/private/") || ($filename eq "/private/etc/") ||
($filename eq "/usr/"));
print "Warning: File \"$filename\"
installed outside of $basepath, /Applications/XDarwin.app, /private/etc/fonts, and
/usr/X11R6\n";
$looks_good = 0;
- }}
+ }
+ }
+ } elsif ($filename ne "$basepath/src/" and $bad_dir = grep {
$filename =~ /^$_/ } @bad_dirs) {
+ # Directory from this list are not allowed to exist in
the .deb.
+ # The only exception is $basepath/src which may exist
but must be empty
+ print "Warning: File installed into deprecated
directory $bad_dir\n";
+ print " Offender is
$filename\n";
+ $looks_good = 0;
} elsif ($filename
=~/^($basepath\/lib\/perl5\/auto\/.*\.bundle)/ ) {
print "Warning: Apparent perl XS module installed
directly into $basepath/lib/perl5 instead of a versioned subdirectory.\n Offending
file: $1\n";
$looks_good = 0;
@@ -886,17 +893,6 @@
}
}
close(DAEMONIC_FILE) or die "Error on close: $!\n";
- } else {
- foreach $bad_dir (@bad_dirs) {
- # Directory from this list are not allowed to
exist in the .deb.
- # The only exception is $basepath/src which
may exist but must be empty
- if ($filename =~ /^$bad_dir/ and not $filename
eq "$basepath/src/") {
- print "Warning: File installed into
deprecated directory $bad_dir\n";
- print "
Offender is $filename\n";
- $looks_good = 0;
- last;
- }
- }
}
}
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.671
retrieving revision 1.672
diff -u -d -r1.671 -r1.672
--- ChangeLog 20 Jul 2004 05:07:07 -0000 1.671
+++ ChangeLog 27 Jul 2004 06:18:03 -0000 1.672
@@ -1,3 +1,9 @@
+2004-07-27 Daniel Macks <[EMAIL PROTECTED]>
+
+ * Validation.pm: Move @bad_dirs check early so don't miss things
+ that get special handling (but not validation) by other matches.
+ Replace @bad_dirs explicit loop with grep {}.
+
2004-07-18 Daniel Macks <[EMAIL PROTECTED]>
* PkgVersion.pm: _Un_restrict use of %a to PatchScript.
-------------------------------------------------------
This SF.Net email is sponsored by BEA Weblogic Workshop
FREE Java Enterprise J2EE developer tools!
Get your free copy of BEA WebLogic Workshop 8.1 today.
http://ads.osdn.com/?ad_id=4721&alloc_id=10040&op=click
_______________________________________________
Fink-commits mailing list
[EMAIL PROTECTED]
https://lists.sourceforge.net/lists/listinfo/fink-commits
