rename logging module to not conflict with the python one

[dak.git] / dak / control_overrides.py

diff --git a/dak/control_overrides.py b/dak/control_overrides.py
index 1add8f5b7627060fa3d9ef2f65937f6d050ee536..ff265266ee1718015c8fc117be4cf06f7e3e7f77 100755 (executable)
--- a/dak/control_overrides.py
+++ b/dak/control_overrides.py
@@ -53,7 +53,7 @@ import pg, sys, time
 import apt_pkg
 from daklib import utils
 from daklib import database
-from daklib import logging
+from daklib import daklog
 from daklib.regexes import re_comments
 
 ################################################################################
@@ -297,7 +297,7 @@ def main ():
     if action == "list":
         list_overrides(suite, component, otype)
     else:
-        if Cnf.has_key("Suite::%s::Untouchable" % suite) and Cnf["Suite::%s::Untouchable" % suite] != 0:
+        if database.get_suite_untouchable(suite):
             utils.fubar("%s: suite is untouchable" % suite)
 
         noaction = 0
@@ -305,7 +305,7 @@ def main ():
             utils.warn("In No-Action Mode")
             noaction = 1
 
-        Logger = logging.Logger(Cnf, "control-overrides", noaction)
+        Logger = daklog.Logger(Cnf, "control-overrides", noaction)
         if file_list:
             for f in file_list:
                 process_file(utils.open_file(f), suite, component, otype, action, noaction)