public inbox for cygwin-apps-cvs@sourceware.org help / color / mirror / Atom feed
From: Jon TURNEY <jturney@sourceware.org> To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20200611-15-gcff06d3 Date: Wed, 26 Aug 2020 14:56:09 +0000 (GMT) [thread overview] Message-ID: <20200826145609.55BFF386188D@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=cff06d3dc719f5277ca9229d42153e5073a03f7e commit cff06d3dc719f5277ca9229d42153e5073a03f7e Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Wed Aug 26 15:48:26 2020 +0100 Further relax unique-version check for python modules https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=0d4ddc942221483b40b65f9cb73ca4715049f075 commit 0d4ddc942221483b40b65f9cb73ca4715049f075 Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Tue Aug 25 17:41:40 2020 +0100 Always discard packages which already exist in relarea Always discard packages which already exist in relarea, rather than keeping them around to warn about if they are different. Diff: --- calm/package.py | 2 +- calm/uploads.py | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/calm/package.py b/calm/package.py index 75f5f9f..d59586a 100755 --- a/calm/package.py +++ b/calm/package.py @@ -872,7 +872,7 @@ def validate_packages(args, packages): # ignore Python module packages, as we may keep old versions of # those - if re.match(r'^python[23][567]-.*', install_p): + if re.match(r'^python[23][5678]?-.*', install_p): continue # ignore packages which don't have a current version (i.e. are test diff --git a/calm/uploads.py b/calm/uploads.py index 2f4bb87..6d20d58 100644 --- a/calm/uploads.py +++ b/calm/uploads.py @@ -267,7 +267,8 @@ def scan(m, all_packages, arch, args): logging.info("discarding, identical %s is already in release area" % fn) remove_success.append(fn) else: - logging.error("ignoring, different %s is already in release area (perhaps you should rebuild with a different version-release identifier?)" % fn) + logging.error("discarding, different %s is already in release area (perhaps you should rebuild with a different version-release identifier?)" % fn) + remove.append(fn) error = True files.remove(f) else:
reply other threads:[~2020-08-26 14:56 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=20200826145609.55BFF386188D@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).