diff --git a/ietf/__init__.py b/ietf/__init__.py index f20bce00b..0f475ce8e 100644 --- a/ietf/__init__.py +++ b/ietf/__init__.py @@ -7,7 +7,7 @@ import checks # pyflakes:ignore __version__ = "6.67.2.dev0" # set this to ".p1", ".p2", etc. after patching -__patch__ = "" +__patch__ = ".p1" __date__ = "$Date$" diff --git a/ietf/bin/generate-draft-aliases b/ietf/bin/generate-draft-aliases index c20c2b3c7..8d6f1d3e7 100755 --- a/ietf/bin/generate-draft-aliases +++ b/ietf/bin/generate-draft-aliases @@ -54,7 +54,11 @@ def get_draft_ad_emails(draft): # If working group document, return current WG ADs wg = draft.group if wg and wg.acronym != 'none' and wg.parent and wg.parent.acronym != 'none': - return get_group_ad_emails(wg) + ad_emails = get_group_ad_emails(wg) + if draft.ad: + if draft.ad.email_address() not in ad_emails: + ad_emails.add(draft.ad.email_address()) + return ad_emails # If not, return explicit AD set (whether up to date or not) ad = draft.ad #return [ad and ad.user and ad.user.email] diff --git a/ietf/secr/proceedings/proc_utils.py b/ietf/secr/proceedings/proc_utils.py index e8d3c638e..8e11356bc 100644 --- a/ietf/secr/proceedings/proc_utils.py +++ b/ietf/secr/proceedings/proc_utils.py @@ -24,7 +24,7 @@ from ietf.utils.log import log from ietf.utils.mail import send_mail AUDIO_FILE_RE = re.compile(r'ietf(?P[\d]+)-(?P.*)-(?P