Commit 307823ca authored by Mark Hymers's avatar Mark Hymers

rename logging module to not conflict with the python one

Signed-off-by: Mark Hymers's avatarMark Hymers <mhy@debian.org>
parent 10c96431
......@@ -25,7 +25,7 @@ import time
import os
import apt_pkg
from daklib import database
from daklib import logging
from daklib import daklog
from daklib import queue
from daklib import utils
from daklib.regexes import re_gpg_fingerprint, re_user_address, re_user_mails, re_user_name
......
......@@ -51,7 +51,7 @@
import pg, sys, os
import apt_pkg
from daklib import database
from daklib import logging
from daklib import daklog
from daklib import utils
################################################################################
......@@ -291,9 +291,9 @@ def main ():
priorities[i[0]] = i[1]
if not Options["No-Action"]:
Logger = logging.Logger(Cnf, "check-overrides")
Logger = daklog.Logger(Cnf, "check-overrides")
else:
Logger = logging.Logger(Cnf, "check-overrides", 1)
Logger = daklog.Logger(Cnf, "check-overrides", 1)
gen_blacklist(Cnf["Dir::Queue::Accepted"])
......
......@@ -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
################################################################################
......@@ -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)
......
......@@ -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
#######################################################################################
......@@ -281,7 +281,7 @@ def main ():
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)
......
......@@ -43,7 +43,7 @@ import pg
import sys
import apt_pkg
from daklib import database
from daklib import logging
from daklib import daklog
from daklib import utils
################################################################################
......@@ -374,7 +374,7 @@ def main():
projectB = pg.connect(Cnf["DB::Name"], Cnf["DB::Host"], int(Cnf["DB::Port"]))
database.init(Cnf, projectB)
Logger = logging.Logger(Cnf, "make-suite-file-list")
Logger = daklog.Logger(Cnf, "make-suite-file-list")
do_da_do_da()
Logger.close()
......
......@@ -23,7 +23,7 @@
import apt_pkg, os, sys, pwd, time, commands
from daklib import queue
from daklib import logging
from daklib import daklog
from daklib import utils
from daklib import database
from daklib.regexes import re_taint_free
......@@ -78,7 +78,7 @@ def init():
if Options["No-Action"]:
Options["Sudo"] = ""
if not Options["Sudo"] and not Options["No-Action"]:
Logger = Upload.Logger = logging.Logger(Cnf, "new-security-install")
Logger = Upload.Logger = daklog.Logger(Cnf, "new-security-install")
return arguments
......
......@@ -27,7 +27,7 @@
import pg, sys
import apt_pkg
from daklib import logging
from daklib import daklog
from daklib import database
from daklib import utils
......@@ -202,7 +202,7 @@ def main ():
game_over()
Logger = logging.Logger(Cnf, "override")
Logger = daklog.Logger(Cnf, "override")
projectB.query("BEGIN WORK")
# We're in "do it" mode, we have something to do... do it
......
......@@ -43,7 +43,7 @@ import time
import re
import apt_pkg, commands
from daklib import database
from daklib import logging
from daklib import daklog
from daklib import queue
from daklib import utils
from daklib.dak_exceptions import *
......@@ -649,7 +649,7 @@ def main():
utils.fubar("Couldn't obtain lock; assuming another 'dak process-accepted' is already running.")
else:
raise
Logger = Upload.Logger = logging.Logger(Cnf, "process-accepted")
Logger = Upload.Logger = daklog.Logger(Cnf, "process-accepted")
if not installing_to_stable and Cnf.get("Dir::UrgencyLog"):
Urgency_Logger = Urgency_Log(Cnf)
......
......@@ -55,7 +55,7 @@ import pwd
import apt_pkg, apt_inst
import examine_package
from daklib import database
from daklib import logging
from daklib import daklog
from daklib import queue
from daklib import utils
from daklib.regexes import re_no_epoch, re_default_answer, re_isanum
......@@ -769,7 +769,7 @@ def init():
if not Options["No-Action"]:
try:
Logger = Upload.Logger = logging.Logger(Cnf, "process-new")
Logger = Upload.Logger = daklog.Logger(Cnf, "process-new")
except CantOpenError, e:
Options["Trainee"] = "True"
......
......@@ -49,7 +49,7 @@ import apt_pkg
from debian_bundle import deb822
from daklib.dbconn import *
from daklib.binary import Binary
from daklib import logging
from daklib import daklog
from daklib import queue
from daklib import utils
from daklib.textutils import fix_maintainer
......@@ -1582,7 +1582,7 @@ def main():
utils.fubar("Couldn't obtain lock; assuming another 'dak process-unchecked' is already running.")
else:
raise
Logger = Upload.Logger = logging.Logger(Cnf, "process-unchecked")
Logger = Upload.Logger = daklog.Logger(Cnf, "process-unchecked")
# debian-{devel-,}-changes@lists.debian.org toggles writes access based on this header
bcc = "X-DAK: dak process-unchecked\nX-Katie: $Revision: 1.65 $"
......
......@@ -22,7 +22,7 @@
import os, pg, sys
import apt_pkg
from daklib import database
from daklib import logging
from daklib import daklog
from daklib import queue
from daklib import utils
from daklib.regexes import re_default_answer
......@@ -72,7 +72,7 @@ def main():
database.init(Cnf, projectB)
Upload = queue.Upload(Cnf)
Logger = Upload.Logger = logging.Logger(Cnf, "reject-proposed-updates")
Logger = Upload.Logger = daklog.Logger(Cnf, "reject-proposed-updates")
bcc = "X-DAK: dak rejected-proposed-updates\nX-Katie: lauren $Revision: 1.4 $"
if Cnf.has_key("Dinstall::Bcc"):
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment