From 8f59ed3ee6e204f64e08e41c4d76c94b1e6a4770 Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 12 Jan 2009 20:28:19 +0000 Subject: [PATCH] Change requested by various users --- doc/makepanda/makepanda.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/makepanda/makepanda.py b/doc/makepanda/makepanda.py index dce5cd104a..87cd4f4c19 100755 --- a/doc/makepanda/makepanda.py +++ b/doc/makepanda/makepanda.py @@ -3666,7 +3666,7 @@ def MakeInstallerLinux(): DeleteCVS("linuxroot") oscmd("chmod -R 555 linuxroot/usr/share/panda3d") - if (os.path.exists("/usr/bin/rpmbuild")): + if (os.path.exists("/usr/bin/rpmbuild") and not os.path.exists("/usr/bin/dpkg-deb")): oscmd("rm -rf linuxroot/DEBIAN") oscmd("rpm -E '%_target_cpu' > built/tmp/architecture.txt") ARCH=ReadFile("built/tmp/architecture.txt").strip() @@ -3801,3 +3801,4 @@ if os.path.isfile("dtool/src/dtoolutil/checkPandaVersion.cxx.moved"): WARNINGS.append("Elapsed Time: "+PrettyTime(time.time() - STARTTIME)) printStatus("Makepanda Final Status Report", WARNINGS) +