From 0411c011cf2fb351efffe89c7cd5437e003ef5b7 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Fri, 5 Mar 2010 11:28:33 +0100
Subject: [PATCH] Switch more code to PathJoin
This should remove most of the remaining constructs which can be
replaced by PathJoin.
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/backend.py | 8 ++++----
lib/jqueue.py | 4 ++--
2 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/lib/backend.py b/lib/backend.py
index e3053e938..367e89c0a 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -2023,8 +2023,8 @@ def ExportSnapshot(disk, dest_node, instance, cluster_name, idx, debug):
comprcmd = "gzip"
- destcmd = utils.BuildShellCmd("mkdir -p %s && cat > %s/%s",
- destdir, destdir, destfile)
+ destcmd = utils.BuildShellCmd("mkdir -p %s && cat > %s",
+ destdir, utils.PathJoin(destdir, destfile))
remotecmd = _GetSshRunner(cluster_name).BuildCmd(dest_node,
constants.GANETI_RUNAS,
destcmd)
@@ -2696,7 +2696,7 @@ class HooksRunner(object):
subdir = "%s-%s.d" % (hpath, suffix)
- dir_name = "%s/%s" % (self._BASE_DIR, subdir)
+ dir_name = utils.PathJoin(self._BASE_DIR, subdir)
results = []
@@ -2789,7 +2789,7 @@ class DevCacheManager(object):
if dev_path.startswith(cls._DEV_PREFIX):
dev_path = dev_path[len(cls._DEV_PREFIX):]
dev_path = dev_path.replace("/", "_")
- fpath = "%s/bdev_%s" % (cls._ROOT_DIR, dev_path)
+ fpath = utils.PathJoin(cls._ROOT_DIR, "bdev_%s" % dev_path)
return fpath
@classmethod
diff --git a/lib/jqueue.py b/lib/jqueue.py
index 1b10b71d2..62a5f4a5d 100644
--- a/lib/jqueue.py
+++ b/lib/jqueue.py
@@ -894,8 +894,8 @@ class JobQueue(object):
@return: the path to the archived job file
"""
- path = "%s/job-%s" % (cls._GetArchiveDirectory(job_id), job_id)
- return utils.PathJoin(constants.JOB_QUEUE_ARCHIVE_DIR, path)
+ return utils.PathJoin(constants.JOB_QUEUE_ARCHIVE_DIR,
+ cls._GetArchiveDirectory(job_id), "job-%s" % job_id)
@classmethod
def _ExtractJobID(cls, name):
--
GitLab