diff --git a/bin/mergedevbranch b/bin/mergedevbranch index ea7ecf63f..81b2ee710 100755 --- a/bin/mergedevbranch +++ b/bin/mergedevbranch @@ -124,7 +124,7 @@ else die "Could not find a branch matching '$branch'" fi -if grep "@$rev $branch" mergelog; then note "Changeset $branch@$rev is already in the merge log. Skipping it."; exit 0; fi +if grep "@$rev $branch" mergelog; then die "Changeset $branch@$rev is already in the merge log. Skipping it."; exit 0; fi note "Will attempt merge from $branch@$rev" diff --git a/ietf/idrfc/mails.py b/ietf/idrfc/mails.py index ce4998f25..3347ac53f 100644 --- a/ietf/idrfc/mails.py +++ b/ietf/idrfc/mails.py @@ -510,8 +510,11 @@ def email_last_call_expired(doc): def email_last_call_expiredREDESIGN(doc): text = "IETF Last Call has ended, and the state has been changed to\n%s." % doc.get_state("draft-iesg").name + to = [x.strip() for x in doc.notify.replace(';', ',').split(',')] + to.insert(0, "iesg@ietf.org") + send_mail(None, - "iesg@ietf.org", + to, "DraftTracker Mail System ", "Last Call Expired: %s" % doc.file_tag(), "idrfc/change_notice.txt",