From 40684c3ae361606d7e81d8e1f9deef5f43fe9412 Mon Sep 17 00:00:00 2001
From: Iustin Pop <iustin@google.com>
Date: Fri, 25 Jun 2010 17:19:11 +0200
Subject: [PATCH] Fix breakage due to OS parameters
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
I was using wrong python installation path (thanks Guido!), so I was not
actually testing the new backend.py module. Two immediate things bugs
are fixed, and after these burnin passes againβ¦
Signed-off-by: Iustin Pop <iustin@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/backend.py | 3 ++-
lib/cmdlib.py | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/backend.py b/lib/backend.py
index 15ac873e5..ed4fb572e 100644
--- a/lib/backend.py
+++ b/lib/backend.py
@@ -1903,7 +1903,8 @@ def _TryOSFromDisk(name, base_dir=None):
export_script=os_files[constants.OS_SCRIPT_EXPORT],
import_script=os_files[constants.OS_SCRIPT_IMPORT],
rename_script=os_files[constants.OS_SCRIPT_RENAME],
- verify_script=os_files[constants.OS_SCRIPT_VERIFY],
+ verify_script=os_files.get(constants.OS_SCRIPT_VERIFY,
+ None),
supported_variants=variants,
supported_parameters=parameters,
api_versions=api_versions)
diff --git a/lib/cmdlib.py b/lib/cmdlib.py
index 2af052b27..a85aef711 100644
--- a/lib/cmdlib.py
+++ b/lib/cmdlib.py
@@ -1816,7 +1816,7 @@ class LUVerifyCluster(LogicalUnit):
_ErrorIf(a != b, self.ENODEOS, node,
"OS %s %s differs from reference node %s: %s vs. %s",
kind, os_name, base.name,
- utils.CommaJoin(a), utils.CommaJoin(a))
+ utils.CommaJoin(a), utils.CommaJoin(b))
# check any missing OSes
missing = set(base.oslist.keys()).difference(nimg.oslist.keys())
--
GitLab