From: Greg Brockman <gdb@mit.edu>
Date: Mon, 23 Aug 2010 21:53:55 +0000 (-0400)
Subject: Use correct call signature for authz.expandAdmin
X-Git-Tag: 0.1.6^0
X-Git-Url: http://xvm.mit.edu/gitweb/invirt/packages/invirt-dev.git/commitdiff_plain/36854cb2fe5fa8b7d27e362c7e4e5d584b13c360

Use correct call signature for authz.expandAdmin
---

diff --git a/debian/changelog b/debian/changelog
index 6143286..b8710ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+invirt-dev (0.1.6) unstable; urgency=low
+
+  * Use correct call signature for authz.expandAdmin
+
+ -- Greg Brockman <gdb@mit.edu>  Mon, 23 Aug 2010 17:53:40 -0400
+
 invirt-dev (0.1.5) unstable; urgency=low
 
   * Log output of all shell calls
diff --git a/invirt-build-conf b/invirt-build-conf
index 1acbc9d..cd0a750 100755
--- a/invirt-build-conf
+++ b/invirt-build-conf
@@ -43,7 +43,7 @@ def main():
     build_handler = '/usr/bin/invirt-submit-build'
 
     for pocket in config.build.pockets:
-        acl = authz.expandAdmin(getattr(config.build.pockets, pocket).acl, None)
+        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)
@@ -54,7 +54,7 @@ def main():
             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, None)
+        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: