From 189a380f04752a53758591f9010c87cb45d5fa13 Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 29 Oct 2009 22:08:50 +0000 Subject: [PATCH] don't rely on packagemaker's exit status --- direct/src/plugin_installer/make_installer.py | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/direct/src/plugin_installer/make_installer.py b/direct/src/plugin_installer/make_installer.py index 1e8ea22714..ec861aeb61 100755 --- a/direct/src/plugin_installer/make_installer.py +++ b/direct/src/plugin_installer/make_installer.py @@ -431,13 +431,18 @@ def makeInstaller(): print "" print CMD - result = subprocess.call(CMD, shell = True) - if result: - sys.exit(result) + + # Don't check the exit status of packagemaker; it's not always + # reliable. + subprocess.call(CMD, shell = True) shutil.rmtree(tmproot) if plistFilename: os.unlink(plistFilename) + + if not os.path.exists('p3d-setup.pkg'): + print "Unable to create p3d-setup.pkg." + sys.exit(1) # Pack the .pkg into a .dmg if not os.path.exists(tmproot): os.makedirs(tmproot)