Merged in [14404] from rjsparks@nostrum.com:

    Include an explicitly set Responsible ADs email addresses in generated aliases when a document has a group.
 - Legacy-Id: 14424
Note: SVN reference [14404] has been migrated to Git commit e36cad6

Author: levkowetz

ietf/__init__.py

@@ -7,7 +7,7 @@
 __version__ = "6.67.2.dev0"
 
 # set this to ".p1", ".p2", etc. after patching
-__patch__   = ""
+__patch__   = ".p1"
 
 __date__    = "$Date$"
 

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]

ietf/secr/proceedings/proc_utils.py

@@ -24,7 +24,7 @@
 from ietf.utils.mail import send_mail
 
 AUDIO_FILE_RE = re.compile(r'ietf(?P<number>[\d]+)-(?P<room>.*)-(?P<time>[\d]{8}-[\d]{4})')
-VIDEO_TITLE_RE = re.compile(r'IETF(?P<number>\d{2})-(?P<name>.*)-(?P<date>\d{8})-(?P<time>\d{4})')
+VIDEO_TITLE_RE = re.compile(r'IETF(?P<number>[\d]+)-(?P<name>.*)-(?P<date>\d{8})-(?P<time>\d{4})')