Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs17.sourceforge.net:/tmp/cvs-serv26637
Modified Files:
ChangeLog Validation.pm
Log Message:
Try to fix Shlibs field whitespace handling (fink-devel "validation question")
Index: Validation.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Validation.pm,v
retrieving revision 1.276
retrieving revision 1.277
diff -u -d -r1.276 -r1.277
--- Validation.pm 12 Jan 2008 20:26:43 -0000 1.276
+++ Validation.pm 14 Jan 2008 06:02:23 -0000 1.277
@@ -1211,13 +1211,14 @@
my @shlibs = split /\n/, $value;
my %shlibs;
foreach (@shlibs) {
+ s/^\s*(.*?)\s*$/$1/; # strip off leading/trailing
whitespace
next unless /\S/;
- if (s/^\s*\(.*?\)\s*//) {
+ if (s/^\(.*?\)\s*//) {
$looks_good = 0 unless
_min_fink_version($options{builddepends}, '0.27.2', 'use of conditionals in
Shlibs', $filename);
}
- if (/^\!\s*(.*?)\s*$/) {
+ if (/^\!\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";
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1523
retrieving revision 1.1524
diff -u -d -r1.1523 -r1.1524
--- ChangeLog 12 Jan 2008 20:26:43 -0000 1.1523
+++ ChangeLog 14 Jan 2008 06:02:23 -0000 1.1524
@@ -1,3 +1,7 @@
+2008-01-14 Daniel Macks <[EMAIL PROTECTED]>
+
+ * Validation.pm: Better toleration of whitespace in .info Shlibs field
+
2008-01-12 Daniel Macks <[EMAIL PROTECTED]>
* Validation.pm: rarian-compat is new version of scrollkeeper in
pangocairo
-------------------------------------------------------------------------
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://ad.doubleclick.net/clk;164216239;13503038;w?http://sf.net/marketplace
_______________________________________________
Fink-commits mailing list
[email protected]
http://news.gmane.org/gmane.os.apple.fink.cvs
