From 75e4e8102fd21760be2cf9bbe8301a8a33934b5a Mon Sep 17 00:00:00 2001 From: Kees Cook Date: Thu, 23 Sep 2021 14:31:52 -0700 Subject: am/shazam: Restore thank-you recording After the shazam refactoring, the thank-you recording went missing from both the "b4 shazam -A" and "b4 am" workflows. Restore the calls. Signed-off-by: Kees Cook Signed-off-by: Konstantin Ryabitsev --- b4/mbox.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/b4/mbox.py b/b4/mbox.py index 96e2d04..dc4cebb 100644 --- a/b4/mbox.py +++ b/b4/mbox.py @@ -255,6 +255,8 @@ def make_am(msgs, cmdargs, msgid): # Blindly attempt to apply to the current tree ecode, out = b4.git_run_command(topdir, ['am'], stdin=ambytes, logstderr=True) logger.info(out.strip()) + if ecode == 0: + thanks_record_am(lser, cherrypick=cherrypick) sys.exit(ecode) if not base_commit: @@ -307,6 +309,7 @@ def make_am(msgs, cmdargs, msgid): logger.critical(' git checkout -b %s %s', gitbranch, base_commit) if cmdargs.outdir != '-': logger.critical(' git am %s', am_filename) + thanks_record_am(lser, cherrypick=cherrypick) def thanks_record_am(lser, cherrypick=None): -- cgit v1.2.3