Преглед на файлове

dpkg-buildpackage: Do not pass -s option to dpkg-architecture

This simplifies variable parsing, as it's in any case the more natural
way to interact with dpkg-architecture.
Guillem Jover преди 13 години
родител
ревизия
4877cdafc0
променени са 1 файла, в които са добавени 3 реда и са изтрити 7 реда
  1. 3 7
      scripts/dpkg-buildpackage.pl

+ 3 - 7
scripts/dpkg-buildpackage.pl

@@ -302,15 +302,11 @@ if ($changedby) {
 }
 }
 
 
 open my $arch_env, '-|', 'dpkg-architecture', "-a$targetarch",
 open my $arch_env, '-|', 'dpkg-architecture', "-a$targetarch",
-    "-t$targetgnusystem", '-s', '-f' or subprocerr('dpkg-architecture');
+    "-t$targetgnusystem", '-f' or subprocerr('dpkg-architecture');
 while ($_ = <$arch_env>) {
 while ($_ = <$arch_env>) {
     chomp;
     chomp;
-    my @cmds = split /\s*;\s*/;
-    foreach (@cmds) {
-	/^\s*(\w+)=([\w-]*)\s*$/ && do {
-	    $ENV{$1} = $2;
-	};
-    }
+    my ($key, $value) = split /=/, $_, 2;
+    $ENV{$key} = $value;
 }
 }
 close $arch_env or subprocerr('dpkg-architecture');
 close $arch_env or subprocerr('dpkg-architecture');