From: TheSin <th...@so...> - 2005-07-29 15:38:53
|
-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 it won't be cause now if a Info2 is added that has spacing it'll break parsing on older finks. We simply can not allow spaces in Info2, without using Info3. - --- TS http://southofheaven.org/ Chaos is the beginning and end, try dealing with the rest. On 29-Jul-05, at 1:55 AM, Dave Vasilevsky wrote: > Update of /cvsroot/fink/fink/perlmod/Fink > In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv4243/perlmod/ > Fink > > Modified Files: > ChangeLog Package.pm > Log Message: > info2 whitespace-fu > > Index: Package.pm > =================================================================== > RCS file: /cvsroot/fink/fink/perlmod/Fink/Package.pm,v > retrieving revision 1.145 > retrieving revision 1.146 > diff -u -d -r1.145 -r1.146 > --- Package.pm 21 Jul 2005 04:26:23 -0000 1.145 > +++ Package.pm 29 Jul 2005 07:55:11 -0000 1.146 > @@ -1217,8 +1217,16 @@ > print "Package description too new to be handled by this > fink ($info_level>$max_info_level)! Skipping $filename\n"; > return {}; > } > + > + # Remove leading whitespace: Use python-like method, where the > first line > + # sets the max amount of whitespace to remove. > + my $content = $properties->{$infon}; > + $content =~ m/^(\s*)/; > + my $spacecount = length($1); > + $content =~ s/^\s{0,$spacecount}//gm; > + > # okay, parse InfoN and promote it to the top level > - my $new_properties = &read_properties_var("$infon of > \"$filename\"", $properties->{$infon}); > + my $new_properties = &read_properties_var("$infon of > \"$filename\"", $content); > $new_properties->{infon} = $info_level; > return $new_properties; > } > > Index: ChangeLog > =================================================================== > RCS file: /cvsroot/fink/fink/perlmod/Fink/ChangeLog,v > retrieving revision 1.1072 > retrieving revision 1.1073 > diff -u -d -r1.1072 -r1.1073 > --- ChangeLog 29 Jul 2005 07:34:59 -0000 1.1072 > +++ ChangeLog 29 Jul 2005 07:55:11 -0000 1.1073 > @@ -1,5 +1,11 @@ > 2005-07-29 Dave Vasilevsky <va...@us...> > > + * Package.pm: Remove leading whitespace in Info2, without > breaking > + RFC-822. All of 10.4-transitional indexes fine with this. > dmacks, please > + check that this is ok! > + > +2005-07-29 Dave Vasilevsky <va...@us...> > + > * Engine.pm: Remove build-as-nobody warning, it's been well > enough > tested by now I'd say. > > > > > ------------------------------------------------------- > 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 > Fin...@li... > https://lists.sourceforge.net/lists/listinfo/fink-commits > > -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.0 (Darwin) iD8DBQFC6k2I6wPs8J05MxMRAgSSAKCPgrM+V32zHuaUdLnfoU9hVSsYJQCcDkbr RLTewr6Fd/hNrwb3ytcn1nQ= =Isib -----END PGP SIGNATURE----- |