sergiomb pushed to dpkg (f22). "Add patch for #642160 (empty argv to dpkg --print-architecture)"

[notifications at fedoraproject.org]

>From b6d4691a4b1d1f47d7ce9567c9998370075bc163 Mon Sep 17 00:00:00 2001
From: "Jeroen van Meeuwen (Ergo Project)"
 <jeroen.van.meeuwen at ergo-project.org>
Date: Sun, 17 Oct 2010 12:30:57 +0100
Subject: Add patch for #642160 (empty argv to dpkg --print-architecture)


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;
-- 
cgit v0.10.2


	http://pkgs.fedoraproject.org/cgit/dpkg.git/commit/?h=f22&id=b6d4691a4b1d1f47d7ce9567c9998370075bc163