diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb index b6917db328..b1d975a4a3 100644 --- a/roles/distgit/templates/genacls.pkgdb +++ b/roles/distgit/templates/genacls.pkgdb @@ -131,8 +131,6 @@ if __name__ == '__main__': (pkg, ACTIVE[branch]) ) -{% if env == 'staging' %} -# While we debug this issue in stg print '' print 'repo %s%s' % (key, pkg) print '\n'.join(buffer) @@ -141,7 +139,6 @@ if __name__ == '__main__': print ' RWC refs/tags/ = %s' % ' '.join(writers) if masters: print ' RWC = %s' % ' '.join(masters) -{% endif %} # Bring backward compatibility while we keep the symlinks in place # from the old to the new locations. diff --git a/roles/distgit/templates/genacls.sh b/roles/distgit/templates/genacls.sh index 1efad29c4b..2c279fcd5d 100644 --- a/roles/distgit/templates/genacls.sh +++ b/roles/distgit/templates/genacls.sh @@ -12,7 +12,6 @@ if /usr/local/bin/genacls.pkgdb > gitolite.conf ; then chown gen-acls:gen-acls -R /etc/gitolite/conf/ HOME=/srv/git /usr/bin/gitolite compile -{% if env == 'staging' %} # After compiling, we have to stick some magic into the gl-conf files of # every repo so that gitolite will understand our symlinks from rpms/ cd /srv/git/repositories @@ -23,7 +22,6 @@ if /usr/local/bin/genacls.pkgdb > gitolite.conf ; then echo '$one_config{"'$repo'"} = $one_config{"rpms/'$repo'"};' >> $repodir/gl-conf; echo '$one_repo{"'$repo'"} = $one_repo{"rpms/'$repo'"};' >> $repodir/gl-conf; done -{% endif %} fi cd /