From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 3D5973858D1E; Mon, 24 Apr 2023 13:25:08 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3D5973858D1E DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1682342708; bh=B+i5dBUPVGSifQQ1xL/LbZAhKrjSG8YC3D9WhKifyTs=; h=To:Subject:Date:From:From; b=a44QpX980wM6IdHUpPd2fTUpRoUANtgxt88EJ1zD76SE4Ic2zJagUUlfOuocUJOnC IZXn69ZBiNo/trgFoi5Z0Cn0us2NERzUjLIcwFB+yyXgY3oUTdYujQNc3S9EAUKEKO eOYcnlEY6YPNUvDz9wIaZG6gy82DYE05Z5c7n/VE= To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-22-gb11508b X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: 33186c17fdbd77548a4a132efbaca686039b5dd3 X-Git-Newrev: b11508bd0bd8fd43c68faaa8ac07f3304ff26393 Message-Id: <20230424132508.3D5973858D1E@sourceware.org> Date: Mon, 24 Apr 2023 13:25:08 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=b11508bd0bd8fd43c68faaa8ac07f3304ff26393 commit b11508bd0bd8fd43c68faaa8ac07f3304ff26393 Author: Jon Turney Date: Sun Apr 23 15:06:59 2023 +0100 Enhance fix-requires-by-path to match paths against a regex Diff: --- calm/fix-requires-by-path.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/calm/fix-requires-by-path.py b/calm/fix-requires-by-path.py index 19b2f71..31d86e7 100644 --- a/calm/fix-requires-by-path.py +++ b/calm/fix-requires-by-path.py @@ -63,7 +63,7 @@ def fix_one_hint(args, dirpath, hintfile, tf): try: with xtarfile.open(os.path.join(dirpath, tf), mode='r') as a: - ivp = any(m.startswith(args.path) for m in a.getnames()) + ivp = any(re.match(args.path, m) for m in a.getnames()) except tarfile.ReadError: pass @@ -105,7 +105,7 @@ if __name__ == "__main__": relarea_default = common_constants.FTP parser = argparse.ArgumentParser(description='Add DEPATOM to requires: of packages which contain a file starting with PATH') - parser.add_argument('path', metavar='PATH', help='path to match') + parser.add_argument('path', metavar='PATH', help='regex of path to match') parser.add_argument('requires', metavar='DEPATOM', help='require to add') parser.add_argument('-v', '--verbose', action='count', dest='verbose', help='verbose output', default=0) parser.add_argument('--releasearea', action='store', metavar='DIR', help="release directory (default: " + relarea_default + ")", default=relarea_default, dest='relarea')