]> git.decadent.org.uk Git - dak.git/blobdiff - daklib/dbconn.py
more typo fixes
[dak.git] / daklib / dbconn.py
index dd5aa2decf3dc2e4ab10ca0f6c293326cfa41a21..701f131f6669f8ad75a719707be8dd28fae092ba 100644 (file)
@@ -506,8 +506,8 @@ class BuildQueue(object):
             os.close()
 
             # Run apt-ftparchive generate
-            os.chdir(os.path.dirname(fl_name))
-            os.system('apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate %s' % os.path.basename(fl_name))
+            os.chdir(os.path.dirname(ac_name))
+            os.system('apt-ftparchive -qq -o APT::FTPArchive::Contents=off generate %s' % os.path.basename(ac_name))
 
             # Run apt-ftparchive release
             # TODO: Eww - fix this
@@ -565,15 +565,15 @@ class BuildQueue(object):
             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: