Hi, So another freeze break request, +1s appreciated. This change is the only thing needed to make non-master-repos an option. Currently, the code always removes master from the requested branches, and crashes if it wasn't there. I'm just adding a check to only remove it (and announce the package) if it was requested.
commit d230b5701575879e757f2c4aeb8eed62c319d9e6 Author: Patrick Uiterwijk <[email protected]> Date: Wed Feb 25 11:34:07 2015 +0000 Only remove master from request if it was requested Signed-off-by: Patrick Uiterwijk <[email protected]> diff --git a/roles/distgit/templates/pkgdb_sync_git_branches.py b/roles/distgit/templates/pkgdb_sync_git_branches.py index c931d26..ced139b 100644 --- a/roles/distgit/templates/pkgdb_sync_git_branches.py +++ b/roles/distgit/templates/pkgdb_sync_git_branches.py @@ -189,16 +189,17 @@ def branch_package(pkgname, branches): if not os.path.exists( os.path.join(GIT_FOLDER, '%s.git' % pkgname)): _invoke(SETUP_PACKAGE, [pkgname]) - branches.remove('master') # SETUP_PACKAGE creates master - fedmsg.publish( - topic='branch', - modname='git', - msg=dict( - agent='pkgdb', - name=pkgname, - branch='master', - ), - ) + if 'master' in branches: + branches.remove('master') # SETUP_PACKAGE creates master + fedmsg.publish( + topic='branch', + modname='git', + msg=dict( + agent='pkgdb', + name=pkgname, + branch='master', + ), + ) # Create all the required branches for the package # Use the translated branch name until pkgdb falls inline With kind regards, Patrick Uiterwijk Fedora Infra _______________________________________________ infrastructure mailing list [email protected] https://admin.fedoraproject.org/mailman/listinfo/infrastructure
