admin: distfiles/specparser.pl - whitespace cleanup
glen
glen at pld-linux.org
Thu Nov 29 19:12:00 CET 2012
Author: glen Date: Thu Nov 29 18:12:00 2012 GMT
Module: admin Tag: HEAD
---- Log message:
- whitespace cleanup
---- Files affected:
admin/distfiles:
specparser.pl (1.25 -> 1.26)
---- Diffs:
================================================================
Index: admin/distfiles/specparser.pl
diff -u admin/distfiles/specparser.pl:1.25 admin/distfiles/specparser.pl:1.26
--- admin/distfiles/specparser.pl:1.25 Tue Jun 14 08:56:49 2011
+++ admin/distfiles/specparser.pl Thu Nov 29 19:11:55 2012
@@ -43,10 +43,10 @@
sub trim_spaces($)
{
my $v = shift;
-
+
$v =~ s/\s+$//;
$v =~ s/^\s+//;
-
+
return $v;
}
@@ -74,7 +74,7 @@
while ($v =~ s/\%\(\s*echo\s+([^\|]+?)\s*\|\s*tr\s*(-d|)\s+([^\)]+?)\s*\)/\@\@tr-me\@\@/) {
my ($what, $d_opt, $how) = ($1, $2, $3);
my ($from, $to) = ($how, "");
- ($from, $to) = ($1, $2)
+ ($from, $to) = ($1, $2)
if $how =~ /^([^\s]+)\s+([^\s]+)$/;
if ($d_opt and $to ne "") {
error("tr -d with second string)");
@@ -88,13 +88,13 @@
error("illegal characters in tr string(s) '$from' '$to'");
}
$v =~ s/\@\@tr-me\@\@/$what/;
-
+
return $v if (length $v > 1000 or $cnt-- <= 0)
}
error("unexpanded macros in $v")
if ($v =~ /\%[^0-9]/);
-
+
return $v;
} # }}}
@@ -156,12 +156,11 @@
}
# continue parsing
-
} elsif ($_ eq '%else') {
# %else happens only when %if was interpreted
# so skip until %endif
-
+
my $level = 0;
while ($_ = shift @{$spec}) {
if ($level <= 0 and $_ eq '%endif') {
@@ -196,7 +195,7 @@
}
}
}
-
+
if (++$total > 10000) {
error("maximum number of bcond posibilities exceeded");
exit 0;
================================================================
---- CVS-web:
http://cvs.pld-linux.org/admin/distfiles/specparser.pl?r1=1.25&r2=1.26
More information about the pld-cvs-commit
mailing list