From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id 9ECDF3858CDA; Tue, 26 Mar 2024 16:58:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 9ECDF3858CDA DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1711472298; bh=tTMwEeVI0uMigQqcvftZXROm6i1JJ3Dk5VrYU1selGA=; h=To:Subject:Date:From:From; b=O0/GUmWJ4e5Y6ge8V8hWVweHQAZYhOERvlib4SOJw3dry9K1brsoSZCJWI8W95zem 4+y5lqtmj6ryGHf4N/EEehYkODjkKxENONuNRLgTG77I3b6hxSGpIE3QVD4wdr4WCb NP7y6t1Nk9PxtAhzDqoz7WuiBn7yKzjDvwmHmQT0= To: cygwin-apps-cvs@sourceware.org Subject: [calm - Cygwin server-side packaging maintenance script] branch master, updated. 20230209-76-g10a4242 X-Git-Refname: refs/heads/master X-Git-Reftype: branch X-Git-Oldrev: d561703e8d4234f6d67eb50ebaa6ec4bf5ed4896 X-Git-Newrev: 10a4242d26b1fc7c54b9aab8d2d14209fed38e73 Message-Id: <20240326165818.9ECDF3858CDA@sourceware.org> Date: Tue, 26 Mar 2024 16:58:18 +0000 (GMT) From: Jon Turney List-Id: https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=10a4242d26b1fc7c54b9aab8d2d14209fed38e73 commit 10a4242d26b1fc7c54b9aab8d2d14209fed38e73 Author: Jon Turney Date: Tue Mar 26 13:49:27 2024 +0000 Add replace option to fix-requires-by-path tool as well Diff: --- calm/fix-requires-by-path.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/calm/fix-requires-by-path.py b/calm/fix-requires-by-path.py index 31d86e7..4fa9e65 100644 --- a/calm/fix-requires-by-path.py +++ b/calm/fix-requires-by-path.py @@ -70,6 +70,8 @@ def fix_one_hint(args, dirpath, hintfile, tf): if ivp: requires = hints.get('requires', '').split() if args.requires not in requires: + if args.replace and args.replace in requires: + requires.remove(args.replace) requires.append(args.requires) requires = sorted(requires) modified = True @@ -82,7 +84,8 @@ def fix_one_hint(args, dirpath, hintfile, tf): # write updated hints shutil.copy2(pn, pn + '.bak') hint.hint_file_write(pn, hints) - # os.system('/usr/bin/diff -uBZ %s %s' % (pn + '.bak', pn)) + if args.verbose: + os.system('/usr/bin/diff -uBZ %s %s' % (pn + '.bak', pn)) def fix_hints(args): @@ -109,6 +112,7 @@ if __name__ == "__main__": 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') + parser.add_argument('--replace', action='store', metavar='DEPATOM', help="replace existing DEPATOM if present") (args) = parser.parse_args() if not args.path.startswith('/'):