[dpkg/f14/master] Add patch for #642160 (empty argv to dpkg --print-architecture)

Jeroen van Meeuwen kanarip at fedoraproject.org
Sun Oct 17 11:38:00 UTC 2010


commit 98b1e95b7c97e8760f622fb6a24e0283f9553baa
Author: Jeroen van Meeuwen (Ergo Project) <jeroen.van.meeuwen at ergo-project.org>
Date:   Sun Oct 17 12:30:57 2010 +0100

    Add patch for #642160 (empty argv to dpkg --print-architecture)

 fedora-bug642160-empty-argv.patch |   15 +++++++++++++++
 1 files changed, 15 insertions(+), 0 deletions(-)
---
diff --git a/fedora-bug642160-empty-argv.patch b/fedora-bug642160-empty-argv.patch
new file mode 100644
index 0000000..86528a3
--- /dev/null
+++ b/fedora-bug642160-empty-argv.patch
@@ -0,0 +1,15 @@
+diff -ur dpkg-1.15.5.6.orig/scripts/Dpkg/Arch.pm dpkg-1.15.5.6/scripts/Dpkg/Arch.pm
+--- dpkg-1.15.5.6.orig/scripts/Dpkg/Arch.pm	2010-01-08 08:00:34.000000000 +0000
++++ dpkg-1.15.5.6/scripts/Dpkg/Arch.pm	2010-10-17 12:29:46.916000478 +0100
+@@ -47,8 +47,9 @@
+ 	return $build_arch if defined $build_arch;
+ 
+ 	my $build_arch = `dpkg --print-architecture`;
+-	# FIXME: Handle bootstrapping
+-	syserr("dpkg --print-architecture failed") if $? >> 8;
++    if ($? >> 8 || $build_arch =~ /^\s*$/) {
++        $build_arch = get_raw_host_arch();
++    }
+ 
+ 	chomp $build_arch;
+ 	return $build_arch;


More information about the scm-commits mailing list