From 16ae6aa182a19ddcd8217c0858e12f4a88b6654d Mon Sep 17 00:00:00 2001 From: David Rose Date: Thu, 5 Jan 2012 21:50:57 +0000 Subject: [PATCH] a little more information for incorrect arguments --- direct/src/p3d/pdeploy.py | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/direct/src/p3d/pdeploy.py b/direct/src/p3d/pdeploy.py index 8800d7f16f..bf141f5956 100644 --- a/direct/src/p3d/pdeploy.py +++ b/direct/src/p3d/pdeploy.py @@ -133,7 +133,8 @@ from direct.p3d.DeploymentTools import Standalone, Installer from pandac.PandaModules import Filename, PandaSystem def usage(code, msg = ''): - print >> sys.stderr, usageText % {'prog' : os.path.split(sys.argv[0])[1]} + if not msg: + print >> sys.stderr, usageText % {'prog' : os.path.split(sys.argv[0])[1]} print >> sys.stderr, msg sys.exit(code) @@ -154,7 +155,7 @@ includeRequires = False try: opts, args = getopt.getopt(sys.argv[1:], 'n:N:v:o:t:P:csl:L:a:A:e:h') except getopt.error, msg: - usage(1, msg) + usage(1, msg or 'Invalid option') for opt, arg in opts: if opt == '-n': @@ -188,11 +189,14 @@ for opt, arg in opts: elif opt == '-h': usage(0) else: - print 'illegal option: ' + flag - sys.exit(1) + msg = 'illegal option: ' + flag + print msg + sys.exit(1, msg) if not args or len(args) != 2: - usage(1) + msg = 'Wrong number of arguments, received %s, expected 2' % ( + len(args or [])) + usage(1, msg) appFilename = Filename.fromOsSpecific(args[0]) if appFilename.getExtension().lower() != 'p3d':