Author: guillem
Date: 2007-02-27 23:59:16 +0100 (Tue, 27 Feb 2007)
New Revision: 652
Modified:
trunk/ChangeLog
trunk/debian/changelog
trunk/scripts/dpkg-gencontrol.pl
Log:
Fix regular expression special-casing Origin, Bugs and Maintainer fields
which was making X[SBC]- fields containing such strings to propagate into
the .deb control file unprocessed. Thanks to Colin Watson.
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2007-02-17 20:08:53 UTC (rev 651)
+++ trunk/ChangeLog 2007-02-27 22:59:16 UTC (rev 652)
@@ -1,3 +1,9 @@
+2007-02-28 Colin Watson <[EMAIL PROTECTED]>
+
+ * scripts/dpkg-gencontrol.pl: Add missing parenthesis in regular
+ expression handling Origin, Bugs and Maintainer for control file
+ fields.
+
2007-02-17 Guillem Jover <[EMAIL PROTECTED]>
* scripts/dpkg-source.pl (checkstats): Take '$dscdir' as an explicit
Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog 2007-02-17 20:08:53 UTC (rev 651)
+++ trunk/debian/changelog 2007-02-27 22:59:16 UTC (rev 652)
@@ -36,6 +36,9 @@
building a .deb package. Closes: #393069
* Exit with an error instead of an assert if the number of conflictors is
exceeded. Remove bogus comments. Closes: #377855
+ * Fix regular expression special-casing Origin, Bugs and Maintainer fields
+ which was making X[SBC]- fields containing such strings to propagate into
+ the .deb control file unprocessed. Thanks to Colin Watson.
[ Updated dpkg translations ]
* Romanian (Eddy Petrișor).
Modified: trunk/scripts/dpkg-gencontrol.pl
===================================================================
--- trunk/scripts/dpkg-gencontrol.pl 2007-02-17 20:08:53 UTC (rev 651)
+++ trunk/scripts/dpkg-gencontrol.pl 2007-02-27 22:59:16 UTC (rev 652)
@@ -126,8 +126,9 @@
$v= $fi{$_};
if (s/^C //) {
#print STDERR "G key >$_< value >$v<\n";
- if (m/^Origin|Bugs|Maintainer$/) { $f{$_}=$v; }
- elsif (m/^Source$/) {
+ if (m/^(Origin|Bugs|Maintainer)$/) {
+ $f{$_} = $v;
+ } elsif (m/^Source$/) {
setsourcepackage($v);
}
elsif (s/^X[CS]*B[CS]*-//i) { $f{$_}= $v; }
--
To UNSUBSCRIBE, email to [EMAIL PROTECTED]
with a subject of "unsubscribe". Trouble? Contact [EMAIL PROTECTED]
