diff options
| author | Alyssa Ross | 2016-09-07 22:48:52 +0100 |
|---|---|---|
| committer | Alyssa Ross | 2016-09-07 22:48:52 +0100 |
| commit | f9e16ee2e04b7b23b273bfa683ab54a85ed40660 (patch) | |
| tree | 27c24d7291b324be2285534c622c360592a7361e /Library/Homebrew/tab.rb | |
| parent | 8bbcbfc0203cde999a0a6e10053ffc173ee73b06 (diff) | |
| download | brew-f9e16ee2e04b7b23b273bfa683ab54a85ed40660.tar.bz2 | |
Combine Tab alias_path with source.path
Diffstat (limited to 'Library/Homebrew/tab.rb')
| -rw-r--r-- | Library/Homebrew/tab.rb | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb index cf15e4c7b..13082a213 100644 --- a/Library/Homebrew/tab.rb +++ b/Library/Homebrew/tab.rb @@ -27,11 +27,10 @@ class Tab < OpenStruct "time" => Time.now.to_i, "source_modified_time" => formula.source_modified_time.to_i, "HEAD" => HOMEBREW_REPOSITORY.git_head, - "alias_path" => formula.alias_path.to_s, "compiler" => compiler, "stdlib" => stdlib, "source" => { - "path" => formula.path.to_s, + "path" => formula.specified_path.to_s, "tap" => formula.tap ? formula.tap.name : nil, "spec" => formula.active_spec_sym.to_s, "versions" => { @@ -56,10 +55,6 @@ class Tab < OpenStruct attributes["source_modified_time"] ||= 0 attributes["source"] ||= {} - if alias_path = attributes["alias_path"] - attributes["alias_path"] = Pathname.new(alias_path) - end - tapped_from = attributes["tapped_from"] unless tapped_from.nil? || tapped_from == "path or URL" attributes["source"]["tap"] = attributes.delete("tapped_from") @@ -142,7 +137,7 @@ class Tab < OpenStruct tab = empty tab.unused_options = f.options.as_flags tab.source = { - "path" => f.path.to_s, + "path" => f.specified_path.to_s, "tap" => f.tap ? f.tap.name : f.tap, "spec" => f.active_spec_sym.to_s, "versions" => { @@ -166,7 +161,6 @@ class Tab < OpenStruct "time" => nil, "source_modified_time" => 0, "HEAD" => nil, - "alias_path" => nil, "stdlib" => nil, "compiler" => DevelopmentTools.default_compiler, "source" => { @@ -298,7 +292,6 @@ class Tab < OpenStruct "time" => time, "source_modified_time" => source_modified_time.to_i, "HEAD" => self.HEAD, - "alias_path" => (alias_path.to_s if alias_path), "stdlib" => (stdlib.to_s if stdlib), "compiler" => (compiler.to_s if compiler), "source" => source |