Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs17:/tmp/cvs-serv16906
Modified Files:
ChangeLog Validation.pm
Log Message:
Actually fail if Shlibs entry is bogus.
Enforce BuildDepends for new Shlibs syntax (NB: update when releasing!)
Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.271
retrieving revision 1.272
diff -u -d -r1.271 -r1.272
--- Validation.pm 13 Oct 2007 20:12:34 -0000 1.271
+++ Validation.pm 13 Oct 2007 20:21:27 -0000 1.272
@@ -1213,13 +1213,15 @@
foreach (@shlibs) {
next unless /\S/;
- if (s/^\s*\(.*?\)\s*//) {
+ if (s/^\s*\(.*?\)\s*//) {
$looks_good = 0 unless
_min_fink_version($options{builddepends}, '0.27.2', 'use of conditionals in
Shlibs', $filename);
- }
+ }
if (/^\!\s*(.*?)\s*$/) {
+ $looks_good = 0 unless
_min_fink_version($options{builddepends}, '0.27.99', 'private-library entry in
Shlibs', $filename);
if ($1 =~ /\s/) {
print "Warning: Malformed line in field
\"shlibs\"$splitoff_field.\n $_\n";
+ $looks_good = 0;
}
next;
}
@@ -1902,7 +1904,7 @@
if (not exists $deb_shlibs->{$libname})
{
print "Error: package contains
a dylib with no corresponding Shlibs entry ($dylib -> $libname
$compat_version)\n";
- print " If this is a
private library, add '!$dylib' to the Shlibs field, and add a BuildDepends:
entry on fink >= 0.27.99.\n";
+ print " If this is a
private library, add '!$dylib' to the Shlibs field.\n";
$looks_good = 0;
}
}
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1498
retrieving revision 1.1499
diff -u -d -r1.1498 -r1.1499
--- ChangeLog 13 Oct 2007 20:12:33 -0000 1.1498
+++ ChangeLog 13 Oct 2007 20:21:26 -0000 1.1499
@@ -1,6 +1,8 @@
2007-10-11 Daniel Macks <[EMAIL PROTECTED]>
- * Validator.pm: More explicit error message.
+ * Validator.pm: More explicit error message when .deb shlibs can't
+ be read. Set failure if bad private Shlibs syntax. Require
+ BD:fink>=0.27.99 if using private Shlibs syntax.
2007-10-11 Benjamin Reed <[EMAIL PROTECTED]>
-------------------------------------------------------------------------
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
Fink-commits@lists.sourceforge.net
http://news.gmane.org/gmane.os.apple.fink.cvs
