aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike McQuaid2017-12-03 09:19:22 +0000
committerGitHub2017-12-03 09:19:22 +0000
commitd0e893fab69957b7ab170cfcc2db6a8f95e3ebac (patch)
tree4dddc2571dfbed69cd01794a133bcddaf4934760
parentc1b85a6f9d9fd8d46afdcc9488c320d39fcb275d (diff)
parent06b9f1c50d62b8f60cf80e407492a3b202e67096 (diff)
downloadbrew-d0e893fab69957b7ab170cfcc2db6a8f95e3ebac.tar.bz2
Merge pull request #3516 from sjackman/system-config-version
config: Print the linked_version [Linux]
-rw-r--r--Library/Homebrew/extend/os/linux/system_config.rb8
1 files changed, 3 insertions, 5 deletions
diff --git a/Library/Homebrew/extend/os/linux/system_config.rb b/Library/Homebrew/extend/os/linux/system_config.rb
index e62b12e71..edb70058f 100644
--- a/Library/Homebrew/extend/os/linux/system_config.rb
+++ b/Library/Homebrew/extend/os/linux/system_config.rb
@@ -20,11 +20,9 @@ class SystemConfig
`#{gcc} --version 2>/dev/null`[/ (\d+\.\d+\.\d+)/, 1]
end
- def formula_version(formula)
+ def formula_linked_version(formula)
return "N/A" unless CoreTap.instance.installed?
- f = Formulary.factory formula
- return "N/A" unless f.installed?
- f.version
+ Formulary.factory(formula).linked_version || "N/A"
rescue FormulaUnavailableError
return "N/A"
end
@@ -35,7 +33,7 @@ class SystemConfig
out.puts "OS: #{host_os_version}"
out.puts "/usr/bin/gcc: #{host_gcc_version}"
["glibc", "gcc", "xorg"].each do |f|
- out.puts "#{f}: #{formula_version f}"
+ out.puts "#{f}: #{formula_linked_version f}"
end
end
end