TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-04 10:54:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jonas Thiem 2015-02-07 22:47:14 +01:00
parent fecb7f69fe
commit 9a96809fa5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makepanda/makepanda.py
View File

@ -6286,14 +6286,14 @@ def MakeInstallerLinux():
oscmd("mkdir --mode=0755 targetroot") oscmd("mkdir --mode=0755 targetroot")
dpkg_present = False 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 dpkg_present = True
rpmbuild_present = False rpmbuild_present = False
if os.path.exists("/usr/bin/rpmbuild"): if os.path.exists("/usr/bin/rpmbuild"):
rpmbuild_present = True rpmbuild_present = True
if dpkg_present and rpmbuild_present: if dpkg_present and rpmbuild_present:
print("Warning: both dpkg-architecture and rpmbuild present.") print("Warning: both dpkg and rpmbuild present.")
if dpkg_present: if dpkg_present:
# Invoke installpanda.py to install it into a temporary dir # Invoke installpanda.py to install it into a temporary dir