From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 77309 invoked by alias); 17 Mar 2016 23:24:32 -0000 Mailing-List: contact cygwin-apps-cvs-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: cygwin-apps-cvs-owner@sourceware.org Received: (qmail 77287 invoked by uid 9795); 17 Mar 2016 23:24:31 -0000 Date: Thu, 17 Mar 2016 23:24:00 -0000 Message-ID: <20160317232431.77261.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. c118ad8400827f35f2839051c4bc77221c840ad0 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 7d1d56da2af457eff0389fa57128174a86b1abf1 X-Git-Newrev: c118ad8400827f35f2839051c4bc77221c840ad0 X-SW-Source: 2016-q1/txt/msg00042.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=c118ad8400827f35f2839051c4bc77221c840ad0 commit c118ad8400827f35f2839051c4bc77221c840ad0 Author: Jon Turney Date: Thu Mar 17 23:22:40 2016 +0000 Exit with non-zero status if we didn't write setup.ini due to a pre-existing package-set error Diff: --- calm | 6 ++++-- 1 files changed, 4 insertions(+), 2 deletions(-) diff --git a/calm b/calm index 340b569..fa095bd 100755 --- a/calm +++ b/calm @@ -76,7 +76,7 @@ def main(args): # validate the package set if not package.validate_packages(args, packages): logging.error("existing package set has errors, not processing uploads or writing setup.ini") - return + return 1 # read maintainer list mlist = maintainers.Maintainer.read(args) @@ -132,6 +132,8 @@ def main(args): # XXX: perhaps we need a --[no]listing command line option to disable this from being run? pkg2html.update_package_listings(args, packages) + return 0 + # # # @@ -169,4 +171,4 @@ if __name__ == "__main__": if args.email: args.email = args.email.split(',') - main(args) + sys.exit(main(args))