From 68b1fcd5c1cb86692f41026838f3519edd4b3d0b Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Thu, 23 Jul 2009 09:58:33 +0100
Subject: [PATCH] Remove references to utils.debug
Various modules set it to True when called in debugging mode, but the
utils module supports no such global.
Signed-off-by: Guido Trotter <ultrotter@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
daemons/ganeti-masterd | 1 -
daemons/ganeti-noded | 1 -
lib/cli.py | 2 --
3 files changed, 4 deletions(-)
diff --git a/daemons/ganeti-masterd b/daemons/ganeti-masterd
index ae241953e..d9b8e7402 100755
--- a/daemons/ganeti-masterd
+++ b/daemons/ganeti-masterd
@@ -473,7 +473,6 @@ def main():
"""Main function"""
options, args = ParseOptions()
- utils.debug = options.debug
utils.no_fork = True
if options.fork:
diff --git a/daemons/ganeti-noded b/daemons/ganeti-noded
index 8b1007614..fada1fe51 100755
--- a/daemons/ganeti-noded
+++ b/daemons/ganeti-noded
@@ -746,7 +746,6 @@ def main():
global queue_lock
options, args = ParseOptions()
- utils.debug = options.debug
if options.fork:
utils.CloseFDs()
diff --git a/lib/cli.py b/lib/cli.py
index fefd2b71b..9f00c9d22 100644
--- a/lib/cli.py
+++ b/lib/cli.py
@@ -735,8 +735,6 @@ def GenericMain(commands, override=None, aliases=None):
utils.SetupLogging(constants.LOG_COMMANDS, debug=options.debug,
stderr_logging=True, program=binary)
- utils.debug = options.debug
-
if old_cmdline:
logging.info("run with arguments '%s'", old_cmdline)
else:
--
GitLab