Skip to content

Commit 9e4f42f

Browse files
committed
Merged in [18748] from rjsparks@nostrum.com:
Also tweaked mergedevbranch. Populate interim approved email correctly. Fixes ietf-tools#3150. - Legacy-Id: 18750 Note: SVN reference [18748] has been migrated to Git commit 21b05d0
1 parent 4a12278 commit 9e4f42f

1 file changed

Lines changed: 6 additions & 1 deletion

File tree

bin/mergedevbranch

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,11 @@ rev=${rev#r}
119119

120120
repo=$(echo -n "$(svn info | grep "^Repository Root: " | sed 's/Repository Root: //')")
121121

122+
by=$(getent passwd $(whoami) | cut -d ':' -f 5 | tr -d ',')
123+
[ -z "$by" ] && die "Can't determine the real name of the user running this script"
124+
125+
python -c 'import django' || die "Can't find django - can't run tests"
126+
122127
note "Identify the branch:"
123128
if svn info $branch > /dev/null 2>&1; then
124129
branch="${branch#^/}"
@@ -226,7 +231,7 @@ goes wrong during final testing.
226231
227232
Regards,
228233
229-
Henrik
234+
$by
230235
(via the mergesprintbranch script)
231236
EOF
232237

0 commit comments

Comments
 (0)