Index: scripts/slave/bootstrap.py |
diff --git a/scripts/slave/bootstrap.py b/scripts/slave/bootstrap.py |
index 8e3b3095043b5fe5a6a0884db506d36b02ccc4ab..6c0d0dc669de553778454efb821c4912e1874670 100644 |
--- a/scripts/slave/bootstrap.py |
+++ b/scripts/slave/bootstrap.py |
@@ -46,7 +46,7 @@ def ImportMasterConfigs(master_name=None): |
setattr(config_bootstrap.Master, 'active_master', symbol) |
-def GetActiveMaster(slavename=None): |
+def GetActiveMaster(slavename=None, default=None): |
"""Parses all the slaves.cfg and returns the name of the active master |
determined by the host name. Returns None otherwise. |
@@ -67,3 +67,4 @@ def GetActiveMaster(slavename=None): |
for key in config_keys: |
if slave.get(key, None) == config_val: |
return slave['master'] |
+ return default |