[PATCH stable-2.11] Improve python dict check

['Jose A. Lopes' via ganeti-devel]

Signed-off-by: Jose A. Lopes <jabolo...@google.com>
---
 tools/cfgupgrade | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/tools/cfgupgrade b/tools/cfgupgrade
index 654d193..ecad9b4 100755
--- a/tools/cfgupgrade
+++ b/tools/cfgupgrade
@@ -150,8 +150,7 @@ def UpgradeCluster(config_data):
   ial_params = cluster.get("default_iallocator_params", None)
   if not ial_params:
     cluster["default_iallocator_params"] = {}
-  if not "candidate_certs" in cluster:
-    cluster["candidate_certs"] = {}
+  cluster["candidate_certs"] = cluster.get("candidate_certs", {})
 
 
 def UpgradeGroups(config_data):
-- 
2.0.0.526.g5318336