diff --git a/bin/mergedevbranch b/bin/mergedevbranch index d615a9ea6..3321a883f 100755 --- a/bin/mergedevbranch +++ b/bin/mergedevbranch @@ -119,7 +119,8 @@ rev=${rev#r} repo=$(echo -n "$(svn info | grep "^Repository Root: " | sed 's/Repository Root: //')") -by=$(getent passwd $(whoami) | cut -d ':' -f 5 | tr -d ',') +[ -z "$by" ] && by=${RELEASER_REAL_NAME} +[ -z "$by" ] && by=$(getent passwd $(whoami) | cut -d ':' -f 5 | tr -d ',') [ -z "$by" ] && die "Can't determine the real name of the user running this script" python -c 'import django' || die "Can't find django - can't run tests" diff --git a/ietf/mailtrigger/migrations/0022_add_doc_external_resource_change_requested.py b/ietf/mailtrigger/migrations/0022_add_doc_external_resource_change_requested.py new file mode 100644 index 000000000..92ace7a8d --- /dev/null +++ b/ietf/mailtrigger/migrations/0022_add_doc_external_resource_change_requested.py @@ -0,0 +1,37 @@ +# Generated by Django 2.2.20 on 2021-05-13 07:20 + +from django.db import migrations + + +def forward(apps, schema_editor): + """Add new MailTrigger and Recipients""" + MailTrigger = apps.get_model('mailtrigger', 'MailTrigger') + Recipient = apps.get_model('mailtrigger', 'Recipient') + + mt, created = MailTrigger.objects.get_or_create(slug='doc_external_resource_change_requested') + if created: + mt.desc='Recipients when a change to the external resources for a document is requested.' + mt.save() + for recipient_slug in [ + "doc_ad", + "doc_group_chairs", + "doc_group_delegates", + "doc_shepherd", + "doc_stream_manager" + ]: + mt.to.add(Recipient.objects.get(slug=recipient_slug)) + + +def reverse(apps, schema_editor): + pass + + +class Migration(migrations.Migration): + + dependencies = [ + ('mailtrigger', '0021_email_remind_action_holders'), + ] + + operations = [ + migrations.RunPython(forward, reverse) + ]