From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id C53D63858D20; Tue, 1 Mar 2022 15:45:02 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org C53D63858D20 To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20210626-32-g1fd3744 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: bf4b922115443862e35af20790ba5322f1c69daa X-Git-Newrev: 1fd374428b07a45b188b29fa4e7b2590a497f51a Message-Id: <20220301154502.C53D63858D20@sourceware.org> Date: Tue, 1 Mar 2022 15:45:02 +0000 (GMT) From: Jon TURNEY X-BeenThere: cygwin-apps-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin-apps git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 01 Mar 2022 15:45:02 -0000 https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=1fd374428b07a45b188b29fa4e7b2590a497f51a commit 1fd374428b07a45b188b29fa4e7b2590a497f51a Author: Jon Turney 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 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)