From 111a7d04af501b7eb612e70cbe2a2f5547ff83d0 Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Mon, 17 Sep 2012 18:28:56 +0200
Subject: [PATCH] Migrate lib/utils/*.py from constants to pathutils
File system paths moved from constants to pathutils.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/utils/__init__.py | 5 +++--
lib/utils/io.py | 3 ++-
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/lib/utils/__init__.py b/lib/utils/__init__.py
index a95cf7f15..5c55b7c01 100644
--- a/lib/utils/__init__.py
+++ b/lib/utils/__init__.py
@@ -41,6 +41,7 @@ import signal
from ganeti import errors
from ganeti import constants
from ganeti import compat
+from ganeti import pathutils
from ganeti.utils.algo import *
from ganeti.utils.filelock import *
@@ -466,7 +467,7 @@ def EnsureDaemon(name):
"""Check for and start daemon if not alive.
"""
- result = RunCmd([constants.DAEMON_UTIL, "check-and-start", name])
+ result = RunCmd([pathutils.DAEMON_UTIL, "check-and-start", name])
if result.failed:
logging.error("Can't start daemon '%s', failure %s, output: %s",
name, result.fail_reason, result.output)
@@ -479,7 +480,7 @@ def StopDaemon(name):
"""Stop daemon
"""
- result = RunCmd([constants.DAEMON_UTIL, "stop", name])
+ result = RunCmd([pathutils.DAEMON_UTIL, "stop", name])
if result.failed:
logging.error("Can't stop daemon '%s', failure %s, output: %s",
name, result.fail_reason, result.output)
diff --git a/lib/utils/io.py b/lib/utils/io.py
index 0e2f007c1..cf3e45324 100644
--- a/lib/utils/io.py
+++ b/lib/utils/io.py
@@ -32,6 +32,7 @@ import stat
from ganeti import errors
from ganeti import constants
+from ganeti import pathutils
from ganeti.utils import filelock
@@ -903,7 +904,7 @@ def DaemonPidFileName(name):
daemon name
"""
- return PathJoin(constants.RUN_DIR, "%s.pid" % name)
+ return PathJoin(pathutils.RUN_DIR, "%s.pid" % name)
def WritePidFile(pidfile):
--
GitLab