Browse Source

Adding additional check for /usr/bin/dpkg-deb back in

Jonas Thiem 11 years ago
parent
commit
9a96809fa5
1 changed files with 2 additions and 2 deletions
  1. 2 2
      makepanda/makepanda.py

+ 2 - 2
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