Fix "git archive" command in invirtibuilder

[invirt/packages/invirt-dev.git] / invirt-build-conf

diff --git a/invirt-build-conf b/invirt-build-conf
index 4c5039f..8df29d2 100755 (executable)
--- a/invirt-build-conf
+++ b/invirt-build-conf
@@ -3,14 +3,17 @@
 """Re-generate the remctl configuration for build submissions.
 
 This script generates the remctl ACL and configuration for each build
 """Re-generate the remctl configuration for build submissions.
 
 This script generates the remctl ACL and configuration for each build

-pocket defined in the configuration.
+pocket defined in the configuration. It also updates the .k5login for
+the git user that developers can push through.

 """
 """

+from __future__ import with_statement

 
 

-
+import contextlib

 import os
 import tempfile
 
 import os
 import tempfile
 

-from invirt.authz import mech as authz
+from invirt import authz
+from invirt import builder

 from invirt.config import structs as config
 
 
 from invirt.config import structs as config
 
 

@@ -24,26 +27,45 @@ def userToPrinc(user):
 
     return princ.replace('.', '/') + '@' + realm
 
 
     return princ.replace('.', '/') + '@' + realm
 

+def acl_path(pocket):
+    return '/etc/remctl/acl/build-%s' % pocket

 
 

-def main():
-    # Python could really use a file-like object that gets written to
-    # a temporary path and moved to its final resting place on
-    # .close(). Oh well.
-    conf = tempfile.NamedTemporaryFile(delete=False)
-    build_handler = '/usr/sbin/invirt-submit-build'
-
-    for pocket in config.git.pockets:
-        acl = authz.expandAdmin(getattr(config.git.pockets, pocket).acl, None)
-
-        acl_fd = tempfile.NamedTemporaryFile(delete=False)
-        print >>acl_fd, '\n'.join(user(a) for a in acl)
+@contextlib.contextmanager
+def atomic_write(file):
+    tmp_fd, tmp_name = tempfile.mkstemp()
+    tmp = os.fdopen(tmp_fd, 'r+')
+    yield tmp
+    tmp.close()
+    os.rename(tmp_name, file)

 
 

-        acl_path = os.path.join('/etc/remctl/acl/build-%s' % pocket)
-
-        os.rename(acl_fd.name, acl_path)
-        print >>conf, 'build %s %s %s' % (pocket, build_handler, acl_path)
-
-    os.rename(conf, '/etc/remctl/conf.d/build')
+def main():
+    all_devs = set()
+    build_handler = '/usr/bin/invirt-submit-build'
+
+    for pocket in config.build.pockets:
+        acl = authz.expandAdmin(getattr(config.build.pockets, pocket).acl)
+        with atomic_write(acl_path(pocket)) as f:
+            princs = [userToPrinc(a) for a in acl]
+            print >>f, '\n'.join(princs)
+            all_devs.update(set(princs))
+
+    with atomic_write('/etc/remctl/conf.d/build') as f:
+        for pocket in config.build.pockets:
+            print >>f, 'build %s %s %s' % (pocket, build_handler, acl_path(pocket))
+
+    with atomic_write('/etc/remctl/acl/repo_admin') as f:
+        acl = authz.expandAdmin(config.build.repo_admin)
+        print >>f, '\n'.join(userToPrinc(a) for a in acl)
+
+    with atomic_write('/etc/remctl/conf.d/repo_admin') as f:
+        print >>f, 'create repo /usr/bin/invirt-add-repo /etc/remctl/acl/repo_admin'
+
+    with atomic_write(os.path.join(builder._REPO_DIR, '.k5login')) as f:
+        if 'repo_access' in config.build:
+            acl = authz.expandAdmin(config.build.repo_access)
+            princs = [userToPrinc(a) for a in acl]
+            all_devs.update(set(princs))
+        print >>f, '\n'.join(all_devs)

 
 
 if __name__ == '__main__':
 
 
 if __name__ == '__main__':