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. 20210626-32-g1fd3744 Date: Tue, 1 Mar 2022 15:45:02 +0000 (GMT) [thread overview] Message-ID: <20220301154502.C53D63858D20@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=1fd374428b07a45b188b29fa4e7b2590a497f51a commit 1fd374428b07a45b188b29fa4e7b2590a497f51a Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Mon Feb 28 17:54:11 2022 +0000 Improve help text and error reporting in 'untest' https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=8ae5338d5961dd6687a720b163d577022fa67510 commit 8ae5338d5961dd6687a720b163d577022fa67510 Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Sat Feb 26 12:51:33 2022 +0000 Move regex for detecting a soversion package to a single place Move the regex for detecting a soversion package to a single place, and adjust it slightly so it doesn't give a false positive on 'libfooN-devel', of which there are some instances. Diff: --- calm/common_constants.py | 2 +- calm/untest.py | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/calm/common_constants.py b/calm/common_constants.py index bc99805..ebbe834 100644 --- a/calm/common_constants.py +++ b/calm/common_constants.py @@ -89,4 +89,4 @@ PACKAGE_COMPRESSIONS_RE = r'\.(' + '|'.join(PACKAGE_COMPRESSIONS) + r')' # inspecting the contents (but that's expensive to do). for the moment, we # recognize soversion packages by the simple heuristic of looking at the package # name -SOVERSION_PACKAGE_RE = r'^lib.*[\d_.]*$' +SOVERSION_PACKAGE_RE = r'^lib.*[\d_.]+$' diff --git a/calm/untest.py b/calm/untest.py index 48a3446..f3995e7 100644 --- a/calm/untest.py +++ b/calm/untest.py @@ -35,7 +35,7 @@ def untest(pvr): # split name and vr match = re.match(r'^(.+?)-(\d.*)', pvr) if not match: - logging.error("unable to extract package and version from '%s'" % (pvr)) + logging.error("unable to determine package and version-release from '%s'" % (pvr)) return p = match.group(1) @@ -84,8 +84,8 @@ def untest(pvr): def main(): - parser = argparse.ArgumentParser(description='test hint remover') - parser.add_argument('package', nargs='*', metavar='PACKAGE') + parser = argparse.ArgumentParser(description='remove test: hint') + parser.add_argument('package', nargs='*', metavar='PVR') (args) = parser.parse_args() logging.getLogger().setLevel(logging.INFO)
reply other threads:[~2022-03-01 15:45 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=20220301154502.C53D63858D20@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).