From c86eaf43888828729dec08a6f095ea97a876fe14 Mon Sep 17 00:00:00 2001 From: Ralph Bean Date: Fri, 8 Apr 2016 13:18:22 +0000 Subject: [PATCH] Do the rpms-checks virtual distgit namespace in prod. --- roles/distgit/templates/genacls.pkgdb | 2 -- roles/distgit/templates/pkgdb_sync_git_branches.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/roles/distgit/templates/genacls.pkgdb b/roles/distgit/templates/genacls.pkgdb index 81b65be678..b4b52f238f 100644 --- a/roles/distgit/templates/genacls.pkgdb +++ b/roles/distgit/templates/genacls.pkgdb @@ -70,13 +70,11 @@ if __name__ == '__main__': #print ' RW private- = @all' # dont' enable the above until we prevent building for real from private- -{% if env == 'staging' %} # XXX - Insert an artificial namespace into the set of namespaces returned # by pkgdb. We want to create a mirror of rpms/PKG in rpms-checks/PKG # This hack occurs in two places. Here, and in the branch-creation script. # https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233 data['rpms-checks'] = copy.copy(data['rpms']) -{% endif %} # Get a list of all the packages for key in data: diff --git a/roles/distgit/templates/pkgdb_sync_git_branches.py b/roles/distgit/templates/pkgdb_sync_git_branches.py index 0526744c29..38fd6b12da 100644 --- a/roles/distgit/templates/pkgdb_sync_git_branches.py +++ b/roles/distgit/templates/pkgdb_sync_git_branches.py @@ -250,13 +250,11 @@ def main(): pkgdb_info = pkgdb_pkg_branch() -{% if env == 'staging' %} # XXX - Insert an artificial namespace into the set of namespaces returned # by pkgdb. We want to create a mirror of rpms/PKG in rpms-checks/PKG # This hack occurs in two places. Here, and in genacls.pkgdb. # https://github.com/fedora-infra/pkgdb2/issues/329#issuecomment-207050233 pkgdb_info['rpms-checks'] = copy.copy(pkgdb_info['rpms']) -{% endif %} for ns in pkgdb_info: namespace = ns