Просмотр исходного кода

Allow back new lines in substvars and maintainer arguments

Regression introdocued in commit d570dcf56c502a36b4747665938025609d5ffe47.
Guillem Jover лет назад: 16
Родитель
Сommit
d4641b248e
3 измененных файлов с 13 добавлено и 6 удалено
  1. 7 0
      debian/changelog
  2. 4 4
      scripts/dpkg-genchanges.pl
  3. 2 2
      scripts/dpkg-source.pl

+ 7 - 0
debian/changelog

@@ -1,3 +1,10 @@
+dpkg (1.15.5.5) UNRELEASED; urgency=low
+
+  * Allow again new lines in dpkg-source and dpkg-genchanges on substvar and
+    maintainer arguments.
+
+ -- Guillem Jover <guillem@debian.org>  Tue, 22 Dec 2009 09:45:08 +0100
+
 dpkg (1.15.5.4) unstable; urgency=low
 
   * Fix Dpkg::Index::get() and remove(). Thanks to Roderich Schupp

+ 4 - 4
scripts/dpkg-genchanges.pl

@@ -170,19 +170,19 @@ while (@ARGV) {
 	$since = $1;
     } elsif (m/^-T(.*)$/) {
 	$varlistfile = $1;
-    } elsif (m/^-m(.*)$/) {
+    } elsif (m/^-m(.*)$/s) {
 	$forcemaint = $1;
-    } elsif (m/^-e(.*)$/) {
+    } elsif (m/^-e(.*)$/s) {
 	$forcechangedby = $1;
     } elsif (m/^-F([0-9a-z]+)$/) {
         $changelogformat = $1;
-    } elsif (m/^-D([^\=:]+)[=:](.*)$/) {
+    } elsif (m/^-D([^\=:]+)[=:](.*)$/s) {
 	$override{$1} = $2;
     } elsif (m/^-u(.*)$/) {
 	$uploadfilesdir = $1;
     } elsif (m/^-U([^\=:]+)$/) {
         $remove{$1} = 1;
-    } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:](.*)$/) {
+    } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:](.*)$/s) {
 	$substvars->set($1, $2);
     } elsif (m/^-(h|-help)$/) {
 	usage();

+ 2 - 2
scripts/dpkg-source.pl

@@ -131,7 +131,7 @@ while (@options) {
         $changelogfile = $1;
     } elsif (m/^-F([0-9a-z]+)$/) {
         $changelogformat = $1;
-    } elsif (m/^-D([^\=:]+)[=:](.*)$/) {
+    } elsif (m/^-D([^\=:]+)[=:](.*)$/s) {
         $override{$1} = $2;
     } elsif (m/^-U([^\=:]+)$/) {
         $remove{$1} = 1;
@@ -151,7 +151,7 @@ while (@options) {
         $options{'no_check'} = 1;
     } elsif (m/^--require-valid-signature$/) {
         $options{'require_valid_signature'} = 1;
-    } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:](.*)$/) {
+    } elsif (m/^-V(\w[-:0-9A-Za-z]*)[=:](.*)$/s) {
         $substvars->set($1, $2);
     } elsif (m/^-T(.*)$/) {
         $varlistfile = $1;