From 9a96809fa5506540490bbbf060d2e9631f23cb79 Mon Sep 17 00:00:00 2001 From: Jonas Thiem Date: Sat, 7 Feb 2015 22:47:14 +0100 Subject: [PATCH] Adding additional check for /usr/bin/dpkg-deb back in --- makepanda/makepanda.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index e3ceecb3b0..ddb29a8c93 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -6286,14 +6286,14 @@ def MakeInstallerLinux(): oscmd("mkdir --mode=0755 targetroot") dpkg_present = False - if os.path.exists("/usr/bin/dpkg-architecture"): + if os.path.exists("/usr/bin/dpkg-architecture") and os.path.exists("/usr/bin/dpkg-deb"): dpkg_present = True rpmbuild_present = False if os.path.exists("/usr/bin/rpmbuild"): rpmbuild_present = True if dpkg_present and rpmbuild_present: - print("Warning: both dpkg-architecture and rpmbuild present.") + print("Warning: both dpkg and rpmbuild present.") if dpkg_present: # Invoke installpanda.py to install it into a temporary dir