diff options
| author | Jon Turney <jon.turney@dronecode.org.uk> | 2017-11-29 20:24:24 +0300 |
|---|---|---|
| committer | Jon Turney <jon.turney@dronecode.org.uk> | 2017-11-30 14:46:59 +0300 |
| commit | a44390655e05567726d4f511a4ec1a890569ffe6 (patch) | |
| tree | 346922057598421140b5cf4daabcd42082588baf | |
| parent | 353e677e736a9ee8094c0c1eaa5da6a89eb6b59c (diff) | |
Make calm and mksetupini return a non-zero exit status on error
| -rwxr-xr-x | calm/calm.py | 9 | ||||
| -rwxr-xr-x | calm/mksetupini.py | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/calm/calm.py b/calm/calm.py index 120d9c8..a1d6ca0 100755 --- a/calm/calm.py +++ b/calm/calm.py @@ -359,12 +359,14 @@ def do_main(args, state): if not packages: logging.error("not processing uploads or writing setup.ini") - return + return 1 state.packages = packages do_output(args, state) + return 0 + # # @@ -641,11 +643,14 @@ def main(): state = CalmState() state.subject = 'calm%s: cygwin package upload report from %s' % (' [dry-run]' if args.dryrun else '', os.uname()[1]) + status = 0 if args.daemon: do_daemon(args, state) else: logging_setup(args) - do_main(args, state) + status = do_main(args, state) + + return status # diff --git a/calm/mksetupini.py b/calm/mksetupini.py index f24e4c5..6433d0f 100755 --- a/calm/mksetupini.py +++ b/calm/mksetupini.py @@ -60,7 +60,7 @@ def do_main(args): # validate the package set if not package.validate_packages(args, packages): logging.error("package set has errors, not writing setup.ini") - return + return 1 # write setup.ini package.write_setup_ini(args, packages, args.arch) @@ -68,6 +68,8 @@ def do_main(args): if args.stats: stats(packages) + return 0 + # # @@ -115,7 +117,7 @@ def main(): logging.basicConfig(format=os.path.basename(sys.argv[0]) + ': %(message)s') - do_main(args) + return do_main(args) # |