diff options
| author | Xu Cheng | 2015-07-30 15:58:20 +0800 |
|---|---|---|
| committer | Xu Cheng | 2015-07-31 19:44:01 +0800 |
| commit | 8f5f27358a4f3eac14b1fe47b97bbafde0f5d98c (patch) | |
| tree | 592bda3dfd1e2a567243319d9380748d3dc43d57 /Library/Homebrew | |
| parent | 5aa6b5c5faa605d3dfd39ce86803c3d967093d06 (diff) | |
| download | brew-8f5f27358a4f3eac14b1fe47b97bbafde0f5d98c.tar.bz2 | |
Formula#installed_prefix: use PkgVersion
Also check stable_prefix when current acitve_spec is not :stable
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/formula.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index a273e3c1c..cfdc0266a 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -284,10 +284,12 @@ class Formula # The latest prefix for this formula. Checks for {#head}, then {#devel} # and then {#stable}'s {#prefix} def installed_prefix - if head && (head_prefix = prefix(head.version)).directory? + if head && (head_prefix = prefix(PkgVersion.new(head.version, revision))).directory? head_prefix - elsif devel && (devel_prefix = prefix(devel.version)).directory? + elsif devel && (devel_prefix = prefix(PkgVersion.new(devel.version, revision))).directory? devel_prefix + elsif stable && (stable_prefix = prefix(PkgVersion.new(stable.version, revision))).directory? + stable_prefix else prefix end |