From: Zack Cerza <zack@cerza.org>
Date: Tue, 13 Aug 2013 18:30:22 +0000 (-0500)
Subject: Fix a case where _get_config_value_for_remote could return None mistakenly
X-Git-Tag: 1.1.0~1981^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f1c9125f27a0c3e552f45a114f9b2779a55c089a;p=teuthology.git

Fix a case where _get_config_value_for_remote could return None mistakenly
---

diff --git a/teuthology/task/install.py b/teuthology/task/install.py
index 106017cc0..3964951ad 100644
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@ -71,14 +71,16 @@ def _run_and_log_error_if_fails(remote, args):
 def _get_config_value_for_remote(ctx, remote, config, key):
     # This function was written to figure out which branch should be used for a
     # given remote. 'all' overrides any applicable roles.
-    if 'all' in config.keys():
-        return config['all'].get(key, None)
-    else:
-        roles = ctx.cluster.remotes[remote]
+
+    roles = ctx.cluster.remotes[remote]
+    if 'all' in config:
+        return config['all'][key]
+    elif roles:
         for role in roles:
             if role in config and key in config[role]:
                 return config[role][key]
-    return None
+    if key in config:
+        return config[key]
 
 
 def _get_baseurlinfo_and_dist(ctx, remote, config):
@@ -137,6 +139,7 @@ def _get_baseurlinfo_and_dist(ctx, remote, config):
         uri = 'sha1/' + sha1
     else:
         # FIXME: Should master be the default?
+        log.debug("defaulting to master branch")
         uri = 'ref/master'
     retval['uri'] = uri