Unified Diff: ensure_dependencies.py
Issue 29329056:
Issue 3194 - Allow multiple sources for a dependency (Closed)
Patch Set:
Created Oct. 12, 2015, 3:46 p.m.
Use n/p to move between diff chunks;
N/P to move between comments.
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')
| Index: ensure_dependencies.py |
| diff --git a/ensure_dependencies.py b/ensure_dependencies.py |
| index cec2bbeed97e14686f1af493fef7179422b69815..e80ce0caaa9a64be0513c48c5ee65e947080ed92 100755 |
| --- a/ensure_dependencies.py |
| +++ b/ensure_dependencies.py |
| @@ -163,6 +163,7 @@ def parse_spec(path, line): |
| return key, result |
| def read_deps(repodir): |
| + parenttype = get_repo_type(repodir) |
| result = {} |
| deps_path = os.path.join(repodir, "dependencies") |
| try: |
| @@ -174,7 +175,7 @@ def read_deps(repodir): |
| continue |
| key, spec = parse_spec(deps_path, line) |
| - if spec: |
| + if spec and (key not in result or parenttype in spec.keys()): |
| result[key] = spec |
| return result |
| except IOError, e: |
« no previous file with comments
|
« no previous file
|
no next file »
|
no next file with comments »
