diff options
| author | Chris Matthews <cmatthews5@apple.com> | 2018-02-07 21:33:33 +0000 |
|---|---|---|
| committer | Chris Matthews <cmatthews5@apple.com> | 2018-02-07 21:33:33 +0000 |
| commit | cbaf8a80a7230731fd3e1bc16ff1b50fa8a92b1a (patch) | |
| tree | e26140a13773899a63e2443966cbdf5edba747a2 | |
| parent | 26350c497fbd80499da5958ed2fc976ca7f4d679 (diff) | |
Use the linked_keg brew info to resolve multiversion dependencies
git-svn-id: https://llvm.org/svn/llvm-project/zorg/trunk@324532 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | dep/dep.py | 5 | ||||
| -rw-r--r-- | dep/tests/assets/brew_cmake_installed.json | 27 |
2 files changed, 22 insertions, 10 deletions
@@ -355,9 +355,12 @@ class Brew(Dependency): version = None for brew_package in brew_package_config: name = brew_package['name'] + linked_keg = brew_package["linked_keg"] + install_info = brew_package.get('installed') for versions in install_info: - version = versions['version'] if versions else None + if linked_keg == versions['version']: + version = versions['version'] if name == self.package: break if not version: diff --git a/dep/tests/assets/brew_cmake_installed.json b/dep/tests/assets/brew_cmake_installed.json index 2fa83939..b80865f1 100644 --- a/dep/tests/assets/brew_cmake_installed.json +++ b/dep/tests/assets/brew_cmake_installed.json @@ -7,7 +7,7 @@ "oldname": null, "aliases": [], "versions": { - "stable": "3.10.0", + "stable": "3.10.2", "bottle": true, "devel": null, "head": "HEAD" @@ -23,6 +23,15 @@ "runtime_dependencies": [], "installed_as_dependency": false, "installed_on_request": true + }, + { + "version": "3.10.2", + "used_options": [], + "built_as_bottle": true, + "poured_from_bottle": true, + "runtime_dependencies": [], + "installed_as_dependency": false, + "installed_on_request": true } ], "linked_keg": "3.10.0", @@ -52,25 +61,25 @@ ], "bottle": { "stable": { - "rebuild": 1, + "rebuild": 0, "cellar": ":any_skip_relocation", "prefix": "/usr/local", "root_url": "https://homebrew.bintray.com/bottles", "files": { "high_sierra": { - "url": "https://homebrew.bintray.com/bottles/cmake-3.10.0.high_sierra.bottle.1.tar.gz", - "sha256": "fa4888d1d009e32398d0ec312b641f86f6eac53cdfd13e5dae57c07922c8033c" + "url": "https://homebrew.bintray.com/bottles/cmake-3.10.2.high_sierra.bottle.tar.gz", + "sha256": "7ad98f403e21c76cfd0789d83acffce92cb29aad3d2ea9b4fe8b2c05de8f33b9" }, "sierra": { - "url": "https://homebrew.bintray.com/bottles/cmake-3.10.0.sierra.bottle.1.tar.gz", - "sha256": "5a6c5af53ce59a89d3f31880fdcc169359ec6ad49daa78ebcaf333c32f481590" + "url": "https://homebrew.bintray.com/bottles/cmake-3.10.2.sierra.bottle.tar.gz", + "sha256": "878aeaeda98df7a8940bdccc42b7ff22195980a62410428f8febc7cd03a1c681" }, "el_capitan": { - "url": "https://homebrew.bintray.com/bottles/cmake-3.10.0.el_capitan.bottle.1.tar.gz", - "sha256": "5e1d7d0abd668e008a695f51778d52b06a229ba6fef5014397f8dab9e4578eca" + "url": "https://homebrew.bintray.com/bottles/cmake-3.10.2.el_capitan.bottle.tar.gz", + "sha256": "05efc0e612c16eabdf8e509545d18a7e1016de2c6cb6deb597b49ffd590dcc0a" } } } } } -] +]
\ No newline at end of file |