| Index: scripts/common/chromium_utils.py
|
| diff --git a/scripts/common/chromium_utils.py b/scripts/common/chromium_utils.py
|
| index 287bd9990e9dd58307ffca8d09c7c1cf70e4e82a..28fd9b78620ff27f722eb61bf53231518d0b6cb0 100644
|
| --- a/scripts/common/chromium_utils.py
|
| +++ b/scripts/common/chromium_utils.py
|
| @@ -1018,7 +1018,7 @@ def EntryToSlaveName(entry):
|
| return entry.get('slavename') or entry.get('hostname')
|
|
|
|
|
| -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 hostname. Returns None otherwise.
|
|
|
| @@ -1029,6 +1029,7 @@ def GetActiveMaster(slavename=None):
|
| for slave in GetAllSlaves():
|
| if slavename == EntryToSlaveName(slave):
|
| return slave['master']
|
| + return default
|
|
|
|
|
| def ParsePythonCfg(cfg_filepath):
|
|
|