From 62dbbe7e48019fad2014059d1b67b3d9a1b72252 Mon Sep 17 00:00:00 2001
From: Guido Trotter <ultrotter@google.com>
Date: Fri, 17 Oct 2008 14:35:43 +0000
Subject: [PATCH] OSFromDisk: use script names from constants
Reviewed-by: iustinp
---
lib/backend.py | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/lib/backend.py b/lib/backend.py
index 022da5feb..10af7ef11 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -1246,7 +1246,7 @@ def OSFromDisk(name, base_dir=None):
% (api_versions, constants.OS_API_VERSION))
# OS Scripts dictionary, we will populate it with the actual script names
- os_scripts = {'create': '', 'export': '', 'import': '', 'rename': ''}
+ os_scripts = dict.fromkeys(constants.OS_SCRIPTS)
for script in os_scripts:
os_scripts[script] = os.path.sep.join([os_dir, script])
@@ -1267,10 +1267,10 @@ def OSFromDisk(name, base_dir=None):
return objects.OS(name=name, path=os_dir, status=constants.OS_VALID_STATUS,
- create_script=os_scripts['create'],
- export_script=os_scripts['export'],
- import_script=os_scripts['import'],
- rename_script=os_scripts['rename'],
+ create_script=os_scripts[constants.OS_SCRIPT_CREATE],
+ export_script=os_scripts[constants.OS_SCRIPT_EXPORT],
+ import_script=os_scripts[constants.OS_SCRIPT_IMPORT],
+ rename_script=os_scripts[constants.OS_SCRIPT_RENAME],
api_versions=api_versions)
--
GitLab