From 6c2daab0b9aae1be1eedf72922624b8c58a8163b Mon Sep 17 00:00:00 2001 From: Toshio Kuratomi Date: Fri, 1 Jul 2011 11:09:52 -0700 Subject: [PATCH] Update from puppet: Do not create new packages with a trailing /master in branch names. The new git branching setup doesn't work with this. --- scripts/distgit/pkgdb2branch.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scripts/distgit/pkgdb2branch.py b/scripts/distgit/pkgdb2branch.py index dee7e4e..8bc0503 100755 --- a/scripts/distgit/pkgdb2branch.py +++ b/scripts/distgit/pkgdb2branch.py @@ -187,7 +187,8 @@ class Brancher(object): (branch, pkgname)) # Add the master to the branch - branch = '%s/master' % branch + # No longer add this after the new branching setup. + #branch = '%s/master' % branch # If branchFrom is None, this is an EOL release # If the directory already exists, no need to invoke mkbranch if branchFrom: