admin/brew
1
0
Fork 0
Code Issues Packages Projects Releases 6 Wiki Activity

tap-info: fix for not installed tap

Browse Source 
Closes Homebrew/homebrew#42890.

Signed-off-by: Xu Cheng <xucheng@me.com>
This commit is contained in:
Xu Cheng 2015-08-13 14:56:14 +08:00
parent 55d685f759
commit 638eda5f2d
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/cmd/tap-info.rb
View File

@ -48,11 +48,11 @@ module Homebrew
command_count = tap.command_files.size command_count = tap.command_files.size
info += "#{command_count} command#{plural(command_count)} " if command_count > 0 info += "#{command_count} command#{plural(command_count)} " if command_count > 0
info += "\n#{tap.path} (#{tap.path.abv})" info += "\n#{tap.path} (#{tap.path.abv})"
info += "\nFrom: #{tap.remote.nil? ? "N/A" : tap.remote}"
else else
info += "Not installed" info += "Not installed"
end end
puts info puts info
puts "From: #{tap.remote.nil? ? "N/A" : tap.remote}"
end end
end end
end end

11
Library/Homebrew/tap.rb
View File

@ -123,20 +123,25 @@ class Tap
end end
def to_hash def to_hash
{ hash = {
"name" => @name, "name" => @name,
"user" => @user, "user" => @user,
"repo" => @repo, "repo" => @repo,
"path" => @path.to_s, "path" => @path.to_s,
"remote" => remote,
"installed" => installed?, "installed" => installed?,
"official" => official?, "official" => official?,
"custom_remote" => custom_remote?,
"formula_names" => formula_names, "formula_names" => formula_names,
"formula_files" => formula_files.map(&:to_s), "formula_files" => formula_files.map(&:to_s),
"command_files" => command_files.map(&:to_s), "command_files" => command_files.map(&:to_s),
"pinned" => pinned? "pinned" => pinned?
} }
if installed?
hash["remote"] = remote
hash["custom_remote"] = custom_remote?
end
hash
end end
# Hash with tap formula renames # Hash with tap formula renames