release-engineering/dist-git
1
0
Fork 0
mirror of https://github.com/release-engineering/dist-git.git synced 2025-02-23 15:02:54 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

config: mkbranch

Browse source
This commit is contained in:
Adam Samalik 2015-03-25 16:38:35 +01:00
parent 5faea74619
commit dbe1877ac3
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
files/mkbranch
View file

@ -30,7 +30,6 @@ IGNORE=
BRANCH="" BRANCH=""
PACKAGES="" PACKAGES=""
SRC_BRANCH="master" SRC_BRANCH="master"
AUTHOR="Fedora Release Engineering <rel-eng@lists.fedoraproject.org>"
Usage() { Usage() {
cat <<EOF cat <<EOF
@ -75,6 +74,11 @@ while [ -n "$1" ] ; do
BRANCH=$1/master BRANCH=$1/master
;; ;;
--default-branch-author )
shift
AUTHOR=$1
;;
* ) * )
if [ -z "$BRANCH" ] ; then if [ -z "$BRANCH" ] ; then
BRANCH="$1" BRANCH="$1"
@ -92,6 +96,10 @@ if [ -z "$BRANCH" -o -z "$PACKAGES" ] ; then
exit -1 exit -1
fi fi
if [ -z $AUTHOR ]; then
AUTHOR="Fedora Release Engineering <rel-eng@lists.fedoraproject.org>"
fi
# Sanity checks before we start doing damage # Sanity checks before we start doing damage
NEWP= NEWP=

3
files/pkgdb_sync_git_branches.py
View file

@ -125,7 +125,8 @@ def _create_branch(pkgname, branch, existing_branches):
return return
try: try:
_invoke(MKBRANCH, [branch, pkgname]) _invoke(MKBRANCH, ["--default-branch-author", pipes.quote(DEFAULT_BRANCH_AUTHOR),
branch, pkgname])
except ProcessError, e: except ProcessError, e:
if e.returnCode == 255: if e.returnCode == 255:
# This is a warning, not an error # This is a warning, not an error