Update of /cvsroot/fink/fink/perlmod/Fink
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv7641
Modified Files:
ChangeLog FinkVersion.pm.in Package.pm Services.pm
Log Message:
remove rfc-822 from info3
Index: Services.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Services.pm,v
retrieving revision 1.176
retrieving revision 1.177
diff -u -d -r1.176 -r1.177
--- Services.pm 12 Aug 2005 19:15:50 -0000 1.176
+++ Services.pm 26 Aug 2005 05:29:54 -0000 1.177
@@ -217,6 +217,8 @@
whitespace characters that are removed from subsequent lines. Defaults to
false.
+This option also B<DOES NOT> allow RFC-822 multi-line syntax.
+
=back
=cut
@@ -251,12 +253,11 @@
$lastkey = "";
$heredoc = 0;
$linenum = 0;
- my ($spacecount, $hdoc_spacecount); # Both top-level and heredocs
+ my $hdoc_spacecount; # number of spaces to remove in heredoc
foreach (@lines) {
$linenum++;
chomp;
- _remove_space(\$spacecount) if ($opts{remove_space});
if ($heredoc > 0) {
# We are inside a HereDoc
@@ -287,6 +288,8 @@
$heredoc++ if (/<<\s*$/ and not /^\s*#/);
}
} else {
+ s/^\s+// if $opts{remove_space};
+
next if /^\s*\#/; # skip comments
next if /^\s*$/; # skip empty lines
if (/^([0-9A-Za-z_.\-]+)\:\s*(\S.*?)\s*$/) {
Index: Package.pm
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/Package.pm,v
retrieving revision 1.155
retrieving revision 1.156
diff -u -d -r1.155 -r1.156
--- Package.pm 24 Aug 2005 06:28:52 -0000 1.155
+++ Package.pm 26 Aug 2005 05:29:54 -0000 1.156
@@ -1113,11 +1113,11 @@
my $pkgname = $properties->{package};
unless ($pkgname) {
print_breaking_stderr "No package name in $filename";
- next;
+ return ();
}
unless ($properties->{version}) {
print_breaking_stderr "No version number for package $pkgname
in $filename";
- next;
+ return ();
}
# fields that should be converted from multiline to
# single-line
Index: ChangeLog
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v
retrieving revision 1.1103
retrieving revision 1.1104
diff -u -d -r1.1103 -r1.1104
--- ChangeLog 25 Aug 2005 05:13:44 -0000 1.1103
+++ ChangeLog 26 Aug 2005 05:29:54 -0000 1.1104
@@ -1,3 +1,8 @@
+2005-08-26 Dave Vasilevsky <[EMAIL PROTECTED]>
+
+ * Package.pm: Don't exit method with 'next'.
+ * Services.pm, FinkVersion.pm.in: Remove RFC-822 from Info3, yay!
+
2005-08-25 Daniel Macks <[EMAIL PROTECTED]>
* Validation.pm: check version-dep syntax in .info pkglist lines.
Index: FinkVersion.pm.in
===================================================================
RCS file: /cvsroot/fink/fink/perlmod/Fink/FinkVersion.pm.in,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -d -r1.27 -r1.28
--- FinkVersion.pm.in 29 Jul 2005 16:42:44 -0000 1.27
+++ FinkVersion.pm.in 26 Aug 2005 05:29:54 -0000 1.28
@@ -156,7 +156,7 @@
sub max_info_level {
# 1 is the original level (same as none specified)
# 2 gives percent-expansion in Package: and multiple Type: syntax.
- # 3 gives leading-whitespace removal in Info2
+ # 3 gives leading-whitespace removal, removes RFC-822
return 3;
}
-------------------------------------------------------
SF.Net email is Sponsored by the Better Software Conference & EXPO
September 19-22, 2005 * San Francisco, CA * Development Lifecycle Practices
Agile & Plan-Driven Development * Managing Projects & Teams * Testing & QA
Security * Process Improvement & Measurement * http://www.sqe.com/bsce5sf
_______________________________________________
Fink-commits mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/fink-commits
