CLE-Infrastructure/ansible
3
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

Only remove master from request if it was requested

Browse source 
Signed-off-by: Patrick Uiterwijk <puiterwijk@redhat.com>
This commit is contained in:
Patrick Uiterwijk 2015-02-25 11:34:07 +00:00
parent 54097dc186
commit 12e10d8279
1 changed files with 11 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

21
roles/distgit/templates/pkgdb_sync_git_branches.py
View file

@ -189,16 +189,17 @@ def branch_package(pkgname, branches):
if not os.path.exists( if not os.path.exists(
os.path.join(GIT_FOLDER, '%s.git' % pkgname)): os.path.join(GIT_FOLDER, '%s.git' % pkgname)):
_invoke(SETUP_PACKAGE, [pkgname]) _invoke(SETUP_PACKAGE, [pkgname])
branches.remove('master') # SETUP_PACKAGE creates master if 'master' in branches:
fedmsg.publish( branches.remove('master') # SETUP_PACKAGE creates master
topic='branch', fedmsg.publish(
modname='git', topic='branch',
msg=dict( modname='git',
agent='pkgdb', msg=dict(
name=pkgname, agent='pkgdb',
branch='master', name=pkgname,
), branch='master',
) ),
)
# Create all the required branches for the package # Create all the required branches for the package
# Use the translated branch name until pkgdb falls inline # Use the translated branch name until pkgdb falls inline