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