]> err.no Git - dak/commitdiff
small fixes
authorMark Hymers <mhy@debian.org>
Wed, 4 Nov 2009 18:40:47 +0000 (18:40 +0000)
committerMark Hymers <mhy@debian.org>
Wed, 4 Nov 2009 18:40:47 +0000 (18:40 +0000)
Signed-off-by: Mark Hymers <mhy@debian.org>
daklib/dbconn.py

index 701f131f6669f8ad75a719707be8dd28fae092ba..7333b612d5bccde2266e108d509a6ff7884eb819 100644 (file)
@@ -503,7 +503,7 @@ class BuildQueue(object):
             (ac_fd, ac_name) = mkstemp()
             os.write(ac_fd, MINIMAL_APT_CONF % {'archivepath': self.path,
                                                 'filelist': fl_name})
-            os.close()
+            os.close(ac_fd)
 
             # Run apt-ftparchive generate
             os.chdir(os.path.dirname(ac_name))
@@ -561,7 +561,7 @@ class BuildQueue(object):
         """WARNING: This routine commits for you"""
         session = DBConn().session().object_session(self)
 
-        if self.generate_metadata:
+        if self.generate_metadata and not dryrun:
             self.write_metadata(starttime)
 
         # Grab files older than our execution time