X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=ff32117e442c088cfab8748a639183cc3d346497;hb=7a76c401541fad47f57eabe27de3efc73e89608b;hp=5e9f547809b0aaccf3e0613904ff56b9a49af824;hpb=30767be11759cacb9fc2daad6a5860f20502eb83;p=dak.git

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index 5e9f5478..ff32117e 100644
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -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))
@@ -514,7 +514,7 @@ class BuildQueue(object):
             bname = os.path.basename(self.path)
             os.chdir(self.path)
             os.chdir('..')
-            os.system("""apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="%s" -o APT::FTPArchive::Release::Label="%s" -o -o APT::FTPArchive::Release::Description="%s" -o APT::FTPArchive::Release::Architectures="${archs}" release %s > Release""", [self.origin, self.label, self.releasedescription, arches, bname])
+            os.system("""apt-ftparchive -qq -o APT::FTPArchive::Release::Origin="%s" -o APT::FTPArchive::Release::Label="%s" -o -o APT::FTPArchive::Release::Description="%s" -o APT::FTPArchive::Release::Architectures="${archs}" release %s > Release""" % [self.origin, self.label, self.releasedescription, arches, bname])
 
             # Sign if necessary
             if self.signingkey:
@@ -561,19 +561,19 @@ 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
-	older = session.query(BuildQueueFile).filter_by(build_queue_id = self.queue_id).filter(BuildQueueFile.lastused + timedelta(seconds=self.stay_of_execution) <= starttime).all()
+        older = session.query(BuildQueueFile).filter_by(build_queue_id = self.queue_id).filter(BuildQueueFile.lastused + timedelta(seconds=self.stay_of_execution) <= starttime).all()
 
         for o in older:
             killdb = False
             try:
                 if dryrun:
-                    print "I: Would have removed %s from the queue"
+                    print "I: Would have removed %s from the queue" % o.fullpath
                 else:
-                    print "I: Removing %s from the queue"
+                    print "I: Removing %s from the queue" % o.fullpath
                     os.unlink(o.fullpath)
                     killdb = True
             except OSError, e: