From cf00dba0c894b0649efb49f181325130c74ae6cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ren=C3=A9=20Nussbaumer?= <rn@google.com>
Date: Mon, 5 Sep 2011 15:09:23 +0200
Subject: [PATCH] Switch other commonprefix to IsBelowDir
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Signed-off-by: RenΓ© Nussbaumer <rn@google.com>
Reviewed-by: Michael Hanselmann <hansmi@google.com>
---
lib/backend.py | 6 +++---
lib/utils/io.py | 5 ++---
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/lib/backend.py b/lib/backend.py
index d02a88841..ede24d129 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -668,7 +668,7 @@ def GetBlockDevSizes(devices):
blockdevs = {}
for devpath in devices:
- if os.path.commonprefix([DEV_PREFIX, devpath]) != DEV_PREFIX:
+ if not utils.IsBelowDir(DEV_PREFIX, devpath):
continue
try:
@@ -2507,8 +2507,8 @@ def _TransformFileStorageDir(fs_dir):
fs_dir = os.path.normpath(fs_dir)
base_fstore = cfg.GetFileStorageDir()
base_shared = cfg.GetSharedFileStorageDir()
- if ((os.path.commonprefix([fs_dir, base_fstore]) != base_fstore) and
- (os.path.commonprefix([fs_dir, base_shared]) != base_shared)):
+ if not (utils.IsBelowDir(base_fstore, fs_dir) or
+ utils.IsBelowDir(base_shared, fs_dir)):
_Fail("File storage directory '%s' is not under base file"
" storage directory '%s' or shared storage directory '%s'",
fs_dir, base_fstore, base_shared)
diff --git a/lib/utils/io.py b/lib/utils/io.py
index fc1be3902..91899a210 100644
--- a/lib/utils/io.py
+++ b/lib/utils/io.py
@@ -502,10 +502,9 @@ def PathJoin(*args):
if not IsNormAbsPath(result):
raise ValueError("Invalid parameters to PathJoin: '%s'" % str(args))
# check that we're still under the original prefix
- prefix = os.path.commonprefix([root, result])
- if prefix != root:
+ if not IsBelowDir(root, result):
raise ValueError("Error: path joining resulted in different prefix"
- " (%s != %s)" % (prefix, root))
+ " (%s != %s)" % (result, root))
return result
--
GitLab