rename logging module to not conflict with the python one

[dak.git] / dak / control_suite.py

diff --git a/dak/control_suite.py b/dak/control_suite.py
index f648b5ece88ca2032fe2d3db2839161978f83580..8dc570222842c5162e98fbdd7ec31d9900f8dce8 100755 (executable)
--- a/dak/control_suite.py
+++ b/dak/control_suite.py
@@ -44,7 +44,7 @@
 import pg, sys
 import apt_pkg
 from daklib import database
-from daklib import logging
+from daklib import daklog
 from daklib import utils
 
 #######################################################################################
@@ -275,13 +275,13 @@ def main ():
         utils.fubar("No action specified.")
 
     # Safety/Sanity check
-    if action == "set" and suite not in ["testing", "etch-m68k", "lenny-r0"]:
+    if action == "set" and suite not in ["testing", "etch-m68k"]:
         utils.fubar("Will not reset suite %s" % (suite))
 
     if action == "list":
         get_list(suite)
     else:
-        Logger = logging.Logger(Cnf, "control-suite")
+        Logger = daklog.Logger(Cnf, "control-suite")
         if file_list:
             for f in file_list:
                 process_file(utils.open_file(f), suite, action)