When run with more than one patch ID, the 'apply' and 'git-am' commands should not continue to process other patches if an earlier one failed. We should stop so the user can address the situation.
Future work: it'd be nice to just pipe all the patches at once to git-am, so that git's nice handling of fixup-and-continue workflow can be used. Signed-off-by: Brian Norris <[email protected]> --- apps/patchwork/bin/pwclient | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/apps/patchwork/bin/pwclient b/apps/patchwork/bin/pwclient index 483330e5c876..38d604e6173d 100755 --- a/apps/patchwork/bin/pwclient +++ b/apps/patchwork/bin/pwclient @@ -269,6 +269,7 @@ def action_apply(rpc, patch_id, apply_cmd=None): if len(s) > 0: proc = subprocess.Popen(apply_cmd, stdin = subprocess.PIPE) proc.communicate(unicode(s).encode('utf-8')) + return proc.returncode else: sys.stderr.write("Error: No patch content found\n") sys.exit(1) @@ -684,14 +685,20 @@ def main(): elif action == 'apply': for patch_id in non_empty(h, patch_ids): - action_apply(rpc, patch_id) + ret = action_apply(rpc, patch_id) + if ret: + sys.stderr.write("Apply failed with exit status %d\n" % ret) + sys.exit(1) elif action == 'git_am': cmd = ['git', 'am'] if do_signoff: cmd.append('-s') for patch_id in non_empty(h, patch_ids): - action_apply(rpc, patch_id, cmd) + ret = action_apply(rpc, patch_id, cmd) + if ret: + sys.stderr.write("'git am' failed with exit status %d\n" % ret) + sys.exit(1) elif action == 'update': for patch_id in non_empty(h, patch_ids): -- 2.2.0.rc2 _______________________________________________ Patchwork mailing list [email protected] https://lists.ozlabs.org/listinfo/patchwork
