From 63a3d8f7aa5242819c1474ad0956371c8dbb982b Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Fri, 5 Oct 2012 02:52:37 +0200
Subject: [PATCH] backend: Check for shared storage also
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
If normal file storage was disabled but shared storage enabled,
β_TransformFileStorageDirβ would still throw an exception.
in βopcodes._CheckStorageTypeβ there's also a check, but I wasn't quite
sure what the correct way of handling it was, so I added a TODO comment.
Signed-off-by: Michael Hanselmann <hansmi@google.com>
Reviewed-by: Iustin Pop <iustin@google.com>
---
lib/backend.py | 3 ++-
lib/opcodes.py | 1 +
2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/lib/backend.py b/lib/backend.py
index dc1378ffc..07ffa7599 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -2702,7 +2702,8 @@ def _TransformFileStorageDir(fs_dir):
@return: the normalized path if valid, None otherwise
"""
- if not constants.ENABLE_FILE_STORAGE:
+ if not (constants.ENABLE_FILE_STORAGE or
+ constants.ENABLE_SHARED_FILE_STORAGE):
_Fail("File storage disabled at configure time")
cfg = _GetConfig()
fs_dir = os.path.normpath(fs_dir)
diff --git a/lib/opcodes.py b/lib/opcodes.py
index dba9fd572..8a88bf026 100644
--- a/lib/opcodes.py
+++ b/lib/opcodes.py
@@ -334,6 +334,7 @@ def _CheckStorageType(storage_type):
raise errors.OpPrereqError("Unknown storage type: %s" % storage_type,
errors.ECODE_INVAL)
if storage_type == constants.ST_FILE:
+ # TODO: What about shared file storage?
RequireFileStorage()
return True
--
GitLab