altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

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

Browse source 
Also tweaked mergedevbranch.

    Populate interim approved email correctly. Fixes #3150.
 - Legacy-Id: 18750
Note: SVN reference [18748] has been migrated to Git commit 21b05d003c
This commit is contained in:
Robert Sparks 2020-12-11 16:43:15 +00:00
parent 4a12278a39
commit 9e4f42f11b
1 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
bin/mergedevbranch
View file

@ -119,6 +119,11 @@ rev=${rev#r}
repo=$(echo -n "$(svn info | grep "^Repository Root: " | sed 's/Repository Root: //')") repo=$(echo -n "$(svn info | grep "^Repository Root: " | sed 's/Repository Root: //')")
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"
note "Identify the branch:" note "Identify the branch:"
if svn info $branch > /dev/null 2>&1; then if svn info $branch > /dev/null 2>&1; then
branch="${branch#^/}" branch="${branch#^/}"
@ -226,7 +231,7 @@ goes wrong during final testing.
Regards, Regards,
Henrik $by
(via the mergesprintbranch script) (via the mergesprintbranch script)
EOF EOF