From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14938 invoked by alias); 23 Jul 2016 13:37:29 -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 14910 invoked by uid 9795); 23 Jul 2016 13:37:28 -0000 Date: Sat, 23 Jul 2016 13:37:00 -0000 Message-ID: <20160723133728.14878.qmail@sourceware.org> From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-4-g17392fb X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 8f82a551da77e431fc56cb24e3553cd923563006 X-Git-Newrev: 17392fb24bce5dc310a303b681dbcd68f693b89c X-SW-Source: 2016-q3/txt/msg00007.txt.bz2 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=17392fb24bce5dc310a303b681dbcd68f693b89c commit 17392fb24bce5dc310a303b681dbcd68f693b89c Author: Jon Turney Date: Sat Jul 23 13:40:08 2016 +0100 Fix arch given when reporting a problem merging uploads Fix reporting of problems with the package set after uploads are merged to correctly identify the arch which has the problem. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=8f11d8dff54e7d61a9641867b8cfeea320948099 commit 8f11d8dff54e7d61a9641867b8cfeea320948099 Author: Ken Brown Date: Sat Jul 16 12:25:01 2016 -0400 Add option 'okmissing=curr' to mksetupini If this option is specified, suppress warning that a package doesn’t have a current version. https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=f834d047265eca03a9053c6c7b222bb4a70f0b9b commit f834d047265eca03a9053c6c7b222bb4a70f0b9b Author: Ken Brown Date: Sat Jul 16 12:06:51 2016 -0400 Don't fail if a package has no curr version Diff: --- calm/calm.py | 3 ++- calm/mksetupini.py | 2 +- calm/package.py | 5 +++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/calm/calm.py b/calm/calm.py index 0f41223..7c7ff4d 100755 --- a/calm/calm.py +++ b/calm/calm.py @@ -149,6 +149,7 @@ def process(args): # merge package sets merged_packages[arch] = package.merge(packages[arch], scan_result[arch].packages, scan_result['noarch'].packages) if not merged_packages[arch]: + logging.error("error while merging uploaded %s packages for %s" % (arch, name)) valid = False break @@ -160,11 +161,11 @@ def process(args): # validate the package set logging.debug("validating merged %s package set for maintainer %s" % (arch, name)) if not package.validate_packages(args, merged_packages[arch]): + logging.error("error while validating merged %s packages for %s" % (arch, name)) valid = False if not valid: # discard move list and merged_packages - logging.error("error while merging uploaded %s packages for %s" % (arch, name)) continue # for each arch and noarch diff --git a/calm/mksetupini.py b/calm/mksetupini.py index 6add377..476b56d 100755 --- a/calm/mksetupini.py +++ b/calm/mksetupini.py @@ -100,7 +100,7 @@ def main(): parser = argparse.ArgumentParser(description='Make setup.ini') parser.add_argument('--arch', action='store', required=True, choices=common_constants.ARCHES) parser.add_argument('--inifile', '-u', action='store', help='output filename', required=True) - parser.add_argument('--okmissing', action='append', help='missing things are ok', choices=['required-package']) + parser.add_argument('--okmissing', action='append', help='missing things which are ok', choices=['curr', 'required-package']) parser.add_argument('--pkglist', action='store', nargs='?', metavar='FILE', help="package maintainer list (default: " + pkglist_default + ")", const=pkglist_default) parser.add_argument('--release', action='store', help='value for setup-release key (default: cygwin)', default='cygwin') parser.add_argument('--releasearea', action='store', metavar='DIR', help="release directory (default: " + relarea_default + ")", default=relarea_default, dest='rel_area') diff --git a/calm/package.py b/calm/package.py index d1e79dd..4cd7065 100755 --- a/calm/package.py +++ b/calm/package.py @@ -411,7 +411,7 @@ def validate_packages(args, packages): logging.error("package '%s' doesn't have any versions" % (p)) error = True # it's also probably a really good idea if a curr version exists - elif 'curr' not in packages[p].stability: + elif 'curr' not in packages[p].stability and 'curr' not in getattr(args, 'okmissing', []): logging.warning("package '%s' doesn't have a curr version" % (p)) # If, for every stability level, the install tarball is empty and there @@ -495,7 +495,8 @@ def validate_packages(args, packages): if re.match(r'^lib.*\d', install_p): continue - versions[packages[install_p].stability['curr']].append(install_p) + if 'curr' in packages[install_p].stability: + versions[packages[install_p].stability['curr']].append(install_p) if len(versions) > 1: out = []