<p><br>
On May 12, 2011 2:09 PM, "Toshio Kuratomi" <<a href="mailto:a.badger@gmail.com">a.badger@gmail.com</a>> wrote:<br>
><br>
> On Thu, May 12, 2011 at 01:42:16PM -0600, Kevin Fenzi wrote:<br>
> > I have 2 items (feel free to vote on them separately if you prefer, as<br>
> > they are independent).<br>
> ><br>
> > 1. The patched gitolite we had installed on pkgs01 in the recent outage<br>
> > was incomplete. When someone tries to push changes on an old style<br>
> > branch it says:<br>
> ><br>
> > remote: refs/heads/f15/master<br>
> > remote: Please see URL for more info<br>
> > remote: error: hook declined to update refs/heads/f15/master<br>
> ><br>
> > But has no actual URL in it. ;)<br>
> > The updated patch says:<br>
> ><br>
> > remote: NOTE: Branch naming scheme has changed. You attempted to push<br>
> > remote: to: refs/heads/f15/master<br>
> > remote: Please see <a href="https://fedoraproject.org/wiki/Dist_Git_Branch_Redux">https://fedoraproject.org/wiki/Dist_Git_Branch_Redux</a> for more info.<br>
> ><br>
> > Fixing this requires us to upgrade gitolite to the new patched version.<br>
> ><br>
> I take it this is the only change to the package? If so, +1.<br>
><br>
> If not, let's apply this as a hotfix via puppet instead.<br>
><br>
> > 2. The pkgdb2branch.py script on pkgs01 still creates new packages with the old style branch names,<br>
> > causing them to not work at all for maintainers. ;(<br>
> ><br>
> > This fix to the script fixes that:<br>
> ><br>
> > ---<br>
> > modules/gitolite/files/distgit/pkgdb2branch.py | 3 ++-<br>
> > 1 files changed, 2 insertions(+), 1 deletions(-)<br>
> ><br>
> > diff --git a/modules/gitolite/files/distgit/pkgdb2branch.py b/modules/gitolite/files/distgit/pkgdb2branch.py<br>
> > index dee7e4e..8bc0503 100755<br>
> > --- a/modules/gitolite/files/distgit/pkgdb2branch.py<br>
> > +++ b/modules/gitolite/files/distgit/pkgdb2branch.py<br>
> > @@ -187,7 +187,8 @@ class Brancher(object):<br>
> > (branch, pkgname))<br>
> ><br>
> > # Add the master to the branch<br>
> > - branch = '%s/master' % branch<br>
> > + # No longer add this after the new branching setup.<br>
> > + #branch = '%s/master' % branch<br>
> > # If branchFrom is None, this is an EOL release<br>
> > # If the directory already exists, no need to invoke mkbranch<br>
> > if branchFrom:<br>
><br>
> +1<br>
></p>
<p>It is the only change. I built the package. I also hotfixed the system before realizing that we were in an outage. </p>