Changeset 2567 for trunk

Timestamp:

Nov 26, 2009, 9:45:03 AM (15 years ago)

Author:

broder

Message:

Replace NamedTemporaryFile? with mkstemp in invirt-build-conf and
invirt-submit-build.

NamedTemporaryFile? lacks the delete kwarg in Python 2.5, meaning that
files are always deleted when the fd is closed.

Location:

trunk/packages/invirt-dev

Files:

• invirt-build-conf (modified) (2 diffs)
• invirt-submit-build (modified) (1 diff)

trunk/packages/invirt-dev/invirt-build-conf

@@ -30 +30 @@
     # a temporary path and moved to its final resting place on
     # .close(). Oh well.
-    conf = tempfile.NamedTemporaryFile(delete=False)
+    conf_fd, conf_name = tempfile.mkstemp()
+    conf = os.fdopen(conf_fd)
     build_handler = '/usr/sbin/invirt-submit-build'
 
@@ -36 +37 @@
         acl = authz.expandAdmin(getattr(config.git.pockets, pocket).acl, None)
 
-        acl_fd = tempfile.NamedTemporaryFile(delete=False)
+        acl_fd, acl_name = tempfile.mkstemp()
+        acl_fd = os.fdopen(acl_fd)
         print >>acl_fd, '\n'.join(user(a) for a in acl)
 
         acl_path = os.path.join('/etc/remctl/acl/build-%s' % pocket)
 
-        os.rename(acl_fd.name, acl_path)
+        os.rename(acl_name, acl_path)
         print >>conf, 'build %s %s %s' % (pocket, build_handler, acl_path)
 
-    os.rename(conf, '/etc/remctl/conf.d/build')
+    os.rename(conf_name, '/etc/remctl/conf.d/build')
 
 

trunk/packages/invirt-dev/invirt-submit-build

@@ -44 +44 @@
     # written the file out, first write the queue entry to a temporary
     # file, and then move it into the queue directory.
-    q = tempfile.NamedTemporaryFile(delete=False)
+    q_fd, q_name = tempfile.mkstemp()
+    q = os.fdopen(q_fd)
     print >>q, "%s %s %s %s" % (pocket, package, commit, principal)
-    os.rename(q.name, q_path)
+    os.rename(q_name, q_path)