From a9f1d0ca6f5ff66737e1c048dd59aeb2f3998c0a Mon Sep 17 00:00:00 2001
From: Ralph Bean <rbean@redhat.com>
Date: Tue, 22 Dec 2015 17:19:42 +0000
Subject: [PATCH] Don't do the magic dist-git map in staging.  Work towards
 phasing it out.

---
 roles/distgit/templates/genacls.pkgdb | 2 ++
 roles/distgit/templates/genacls.sh    | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb
index b1d975a4a3..c1920b108b 100644
--- a/roles/distgit/templates/genacls.pkgdb
+++ b/roles/distgit/templates/genacls.pkgdb
@@ -131,6 +131,7 @@ if __name__ == '__main__':
                         (pkg, ACTIVE[branch])
                     )
 
+            {% if env != 'staging' %}
             print ''
             print 'repo %s%s' % (key, pkg)
             print '\n'.join(buffer)
@@ -139,6 +140,7 @@ 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 d987589d37..079f98eb3e 100644
--- a/roles/distgit/templates/genacls.sh
+++ b/roles/distgit/templates/genacls.sh
@@ -14,6 +14,7 @@ mv gitolite.conf /etc/gitolite/conf/
 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
@@ -34,6 +35,7 @@ for repodir in *.git; do
         echo '$one_repo{"rpms/'$repo'"} = $one_repo{"'$repo'"};' >> $glconf;
     fi
 done
+{% endif %}
 
 cd /