Chromium Code Reviews| Index: devil/devil/devil_env.py |
| diff --git a/devil/devil/devil_env.py b/devil/devil/devil_env.py |
| index b54e6f5bdacc7205d1d025d5dad8dc53778d5ba6..457fd92a6743c6a3d1149b40014669b84c16e665 100644 |
| --- a/devil/devil/devil_env.py |
| +++ b/devil/devil/devil_env.py |
| @@ -47,24 +47,39 @@ _LEGACY_ENVIRONMENT_VARIABLES = { |
| } |
| -def _GetEnvironmentVariableConfig(): |
| - path_config = ( |
| - (os.environ.get(k), v) |
| - for k, v in _LEGACY_ENVIRONMENT_VARIABLES.iteritems()) |
| +def EmptyConfig(): |
| return { |
|
rnephew (Reviews Here)
2016/08/22 15:36:16
Like these improvements a lot.
|
| 'config_type': 'BaseConfig', |
| - 'dependencies': { |
| - c['dependency_name']: { |
| - 'file_info': { |
| - c['platform']: { |
| - 'local_paths': [p], |
| - }, |
| + 'dependencies': {} |
| + } |
| + |
| + |
| +def LocalConfigItem(dependency_name, dependency_platform, dependency_path): |
| + if isinstance(dependency_path, basestring): |
| + dependency_path = [dependency_path] |
| + return { |
| + dependency_name: { |
| + 'file_info': { |
| + dependency_platform: { |
| + 'local_paths': dependency_path |
| }, |
| - } for p, c in path_config if p |
| + }, |
| }, |
| } |
| +def _GetEnvironmentVariableConfig(): |
| + env_config = EmptyConfig() |
| + path_config = ( |
| + (os.environ.get(k), v) |
| + for k, v in _LEGACY_ENVIRONMENT_VARIABLES.iteritems()) |
| + path_config = ((p, c) for p, c in path_config if p) |
| + for p, c in path_config: |
| + env_config['dependencies'].update( |
| + LocalConfigItem(c['dependency_name'], c['platform'], p)) |
| + return env_config |
| + |
| + |
| class _Environment(object): |
| def __init__(self): |