log instead of print

Signed-off-by: Mark Hymers <mhy@debian.org>

diff --git a/dak/manage_build_queues.py b/dak/manage_build_queues.py
index 53f7ed70fbb5da9a4c58d119906d46894fffc06d..da4939c5dd05c15ef26edb12760b08c82a927d91 100755 (executable)
--- a/dak/manage_build_queues.py
+++ b/dak/manage_build_queues.py
@@ -92,7 +92,7 @@ def main ():
     # For each given queue, look up object and call manage_queue
     for q in queues:
         Logger.log(['cleaning queue %s using datetime %s' % (q.queue_name, starttime)])
-        q.clean_and_update(starttime, dryrun=Options["No-Action"])
+        q.clean_and_update(starttime, Logger, dryrun=Options["No-Action"])
 
     Logger.close()
 

diff --git a/daklib/dbconn.py b/daklib/dbconn.py
index c29040a47011fa46dbe43c71f361acd1d0ab2da6..84d5b1c2c059fd586793bdbe54d1b0f0468a95d6 100644 (file)
--- a/daklib/dbconn.py
+++ b/daklib/dbconn.py
@@ -565,7 +565,7 @@ class BuildQueue(object):
                 except OSError:
                     pass
 
-    def clean_and_update(self, starttime, dryrun=False):
+    def clean_and_update(self, starttime, Logger, dryrun=False):
         """WARNING: This routine commits for you"""
         session = DBConn().session().object_session(self)
 
@@ -579,9 +579,9 @@ class BuildQueue(object):
             killdb = False
             try:
                 if dryrun:
-                    print "I: Would have removed %s from the queue" % o.fullpath
+                    Logger.log(["I: Would have removed %s from the queue" % o.fullpath])
                 else:
-                    print "I: Removing %s from the queue" % o.fullpath
+                    Logger.log(["I: Removing %s from the queue" % o.fullpath])
                     os.unlink(o.fullpath)
                     killdb = True
             except OSError, e:
@@ -590,7 +590,7 @@ class BuildQueue(object):
                     killdb = True
                 else:
                     # TODO: Replace with proper logging call
-                    print "E: Could not remove %s" % o.fullpath
+                    Logger.log(["E: Could not remove %s" % o.fullpath])
 
             if killdb:
                 session.delete(o)
@@ -606,13 +606,13 @@ class BuildQueue(object):
             except NoResultFound:
                 fp = os.path.join(self.path, f)
                 if dryrun:
-                    print "I: Would remove unused link %s" % fp
+                    Logger.log(["I: Would remove unused link %s" % fp])
                 else:
-                    print "I: Removing unused link %s" % fp
+                    Logger.log(["I: Removing unused link %s" % fp])
                     try:
                         os.unlink(fp)
                     except OSError:
-                        print "E: Failed to unlink unreferenced file %s" % r.fullpath
+                        Logger.log(["E: Failed to unlink unreferenced file %s" % r.fullpath])
 
     def add_file_from_pool(self, poolfile):
         """Copies a file into the pool.  Assumes that the PoolFile object is