Kaynağa Gözat

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.

Guillem Jover 19 yıl önce
ebeveyn
işleme
c0ee514c42
3 değiştirilmiş dosya ile 12 ekleme ve 2 silme
  1. 6 0
      ChangeLog
  2. 3 0
      debian/changelog
  3. 3 2
      scripts/dpkg-gencontrol.pl

+ 6 - 0
ChangeLog

@@ -1,3 +1,9 @@
+2007-02-28  Colin Watson  <cjwatson@ubuntu.com>
+
+	* scripts/dpkg-gencontrol.pl: Add missing parenthesis in regular
+	expression handling Origin, Bugs and Maintainer for control file
+	fields.
+
 2007-02-17  Guillem Jover  <guillem@debian.org>
 
 	* scripts/dpkg-source.pl (checkstats): Take '$dscdir' as an explicit

+ 3 - 0
debian/changelog

@@ -36,6 +36,9 @@ dpkg (1.14.0) UNRELEASED; urgency=low
     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).

+ 3 - 2
scripts/dpkg-gencontrol.pl

@@ -126,8 +126,9 @@ for $_ (keys %fi) {
     $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; }