summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKees Cook <keescook@chromium.org>2021-09-23 14:31:52 -0700
committerKonstantin Ryabitsev <konstantin@linuxfoundation.org>2021-09-24 16:54:56 -0400
commit75e4e8102fd21760be2cf9bbe8301a8a33934b5a (patch)
tree91decf367697a7c9bfe6ab73e6093f28ab83f26a
parent68e4d1fe28e0747ecece2ef6768e5c6cdb7db4f4 (diff)
downloadb4-75e4e8102fd21760be2cf9bbe8301a8a33934b5a.tar.gz
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 <keescook@chromium.org> Signed-off-by: Konstantin Ryabitsev <konstantin@linuxfoundation.org>
-rw-r--r--b4/mbox.py3
1 files changed, 3 insertions, 0 deletions
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):