From d274b2096fe032ba556899c9caac9972912cc993 Mon Sep 17 00:00:00 2001 From: Wayne Davison Date: Sat, 25 Jul 2020 10:52:49 -0700 Subject: [PATCH] Have release script use patch-update --make (not --shell) --- packaging/release-rsync | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packaging/release-rsync b/packaging/release-rsync index 08779e4f..8423fc53 100755 --- a/packaging/release-rsync +++ b/packaging/release-rsync @@ -233,8 +233,8 @@ About to: - git commit all changes - generate the manpages - merge the {args.master_branch} branch into the patch/{args.master_branch}/* branches - - update the files in the "patches" dir and OPTIONALLY - (if you type 'y') to launch a shell for each patch + - update the files in the "patches" dir and OPTIONALLY (if you type 'y') to + run patch-update with the --make option (which opens a shell on error) """) ans = input(" ") @@ -255,8 +255,8 @@ About to: die('Aborting') if re.match(r'^y', ans, re.I): - print(f'\nVisiting all "patch/{args.master_branch}/*" branches ...') - cmd_run(f"packaging/patch-update --branch={args.master_branch} --skip-check --shell") + print(f'\nRunning smart-make on all "patch/{args.master_branch}/*" branches ...') + cmd_run(f"packaging/patch-update --branch={args.master_branch} --skip-check --make") if os.path.isdir('patches/.git'): s = cmd_run(f"cd patches && git commit -a -m 'The patches for {version}.'") -- 2.47.2