The following commit has been merged in the master branch:
commit 4877cdafc05af1c14a28f10555147403813ccf0d
Author: Guillem Jover <[email protected]>
Date: Wed Apr 3 13:12:15 2013 +0200
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.
diff --git a/scripts/dpkg-buildpackage.pl b/scripts/dpkg-buildpackage.pl
index 5606e7a..6b53908 100755
--- a/scripts/dpkg-buildpackage.pl
+++ b/scripts/dpkg-buildpackage.pl
@@ -302,15 +302,11 @@ if ($changedby) {
}
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>) {
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');
--
dpkg's main repository
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
