Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs17:/tmp/cvs-serv14794/perlmod/Fink
Modified Files:
ChangeLog Validation.pm
Log Message:
fix for /usr/X11 validation
Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.266
retrieving revision 1.267
diff -u -d -r1.266 -r1.267
--- Validation.pm 16 Jul 2007 02:32:35 -0000 1.266
+++ Validation.pm 1 Aug 2007 15:39:28 -0000 1.267
@@ -1418,7 +1418,8 @@
# these are used in a regex and are automatically prepended with ^
# make sure to protect regex metachars!
my @bad_dirs = ("$basepath/src/", "$basepath/man/", "$basepath/info/",
"$basepath/doc/", "$basepath/libexec/", "$basepath/lib/locale/", ".*/CVS/",
".*/RCS/", '.*/\.svn/');
- my @good_dirs = ( map "$basepath/$_", qw/ bin sbin include lib share
var etc src Applications X11 / );
+ my @good_dirs = ( map "$basepath/$_", qw/ bin sbin include lib share
var etc src Applications / );
+ push(@good_dirs, '/usr/X11');
my @found_bad_dir;
my $installed_headers = 0;
@@ -1553,12 +1554,12 @@
&stack_msg($msgs, "Overwriting essential system
symlink pointing to /private$filename", $filename);
} elsif ($filename =~ /^\/mach/) {
&stack_msg($msgs, "Overwriting essential system
symlink pointing to /mach.sym", $filename);
- } elsif ($deb_control->{package} !~ /^(xfree86|xorg)/) {
+ } elsif ($deb_control->{package} !~
/^(xfree86|xorg|mesa)/ and $deb_control->{section} !~ /x11-modular/) {
&stack_msg($msgs, "File installed outside of
$basepath", $filename);
} else {
- if (not (($filename =~
/^\/Applications\/XDarwin.app/) || ($filename =~ /^\/usr\/X11R6/) || ($filename
=~ /^\/private\/etc\/fonts/) )) {
+ if (not (($filename =~
/^\/Applications\/XDarwin.app/) || ($filename =~ /^\/usr\/X11/) || ($filename
=~ /^\/private\/etc\/fonts/) )) {
return if (($filename eq
"/Applications/") || ($filename eq "/private/") || ($filename eq
"/private/etc/") || ($filename eq "/usr/"));
- &stack_msg($msgs, "File installed
outside of $basepath, /Applications/XDarwin.app, /private/etc/fonts, and
/usr/X11R6", $filename);
+ &stack_msg($msgs, "File installed
outside of $basepath, /Applications/XDarwin.app, /private/etc/fonts, /usr/X11,
and /usr/X11R6", $filename);
}
}
} elsif ($filename ne "$basepath/src/" and @found_bad_dir =
grep { $filename =~ /^$_/ } @bad_dirs) {
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1483
retrieving revision 1.1484
diff -u -d -r1.1483 -r1.1484
--- ChangeLog 20 Jul 2007 21:56:21 -0000 1.1483
+++ ChangeLog 1 Aug 2007 15:39:27 -0000 1.1484
@@ -1,3 +1,7 @@
+2007-08-01 Benjamin Reed <[EMAIL PROTECTED]>
+
+ * Validation.pm: Handle /usr/X11 packages properly.
+
2007-07-15 Daniel Macks <[EMAIL PROTECTED]>
* VirtPackage.pm: use apple's own plist parser
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
