public inbox for cygwin-apps-cvs@sourceware.org help / color / mirror / Atom feed
From: jturney@sourceware.org To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-61-gece907f Date: Mon, 10 Apr 2017 12:40:00 -0000 [thread overview] Message-ID: <20170410124029.11287.qmail@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=ece907f71b7148b0eb1ad207a32eb6408d2d4940 commit ece907f71b7148b0eb1ad207a32eb6408d2d4940 Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Sun Apr 9 18:39:21 2017 +0100 Improve 'should be categorized obsolete' test to apply to each version There are some ligitimate cases of this condition, so this is only logged at info severity. Diff: --- calm/package.py | 27 +++++++++++---------------- 1 files changed, 11 insertions(+), 16 deletions(-) diff --git a/calm/package.py b/calm/package.py index 2891e0d..a2ec6f8 100755 --- a/calm/package.py +++ b/calm/package.py @@ -561,23 +561,15 @@ def validate_packages(args, packages): packages[p].best_version = None error = True - # If, for every stability level, the install tarball is empty and there - # is no source tarball, we should probably be marked obsolete + # If the install tarball is empty and there is no source tarball, we + # should probably be marked obsolete if not packages[p].skip: - if not obsolete: - has_something = False - - for l in ['test', 'curr', 'prev']: - if l in packages[p].stability: - v = packages[p].stability[l] - if 'source' in packages[p].vermap[v]: - has_something = True - elif 'install' in packages[p].vermap[v]: - if not packages[p].tars[packages[p].vermap[v]['install']].is_empty: - has_something = True - - if not has_something: - logging.warning("package '%s' has empty install tar file and no source for all levels, but it's not in the _obsolete category" % (p)) + for vr in packages[p].version_hints: + if '_obsolete' not in packages[p].version_hints[vr].get('category', ''): + if 'source' not in packages[p].vermap[vr]: + if 'install' in packages[p].vermap[vr]: + if packages[p].tars[packages[p].vermap[vr]['install']].is_empty: + logging.info("package '%s' version '%s' has empty install tar file and no source, but it's not in the _obsolete category" % (p, vr)) # make another pass to verify a source tarfile exists for every install # tarfile version @@ -920,6 +912,9 @@ def mark_package_fresh(packages, p, v): return # unless the install tarfile is empty ... + if 'install' not in packages[p].vermap[v]: + return + if packages[p].tars[packages[p].vermap[v]['install']].is_empty: return
reply other threads:[~2017-04-10 12:40 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions: You may reply publicly to this message via plain-text email using any one of the following methods: * Save the following mbox file, import it into your mail client, and reply-to-all from there: mbox Avoid top-posting and favor interleaved quoting: https://en.wikipedia.org/wiki/Posting_style#Interleaved_style * Reply using the --to, --cc, and --in-reply-to switches of git-send-email(1): git send-email \ --in-reply-to=20170410124029.11287.qmail@sourceware.org \ --to=jturney@sourceware.org \ --cc=cygwin-apps-cvs@sourceware.org \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).