aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorL. E. Segovia2017-12-02 13:41:11 +0000
committerL. E. Segovia2017-12-02 13:41:11 +0000
commit5f5e68975244beab041ca4aee4b8a83f6dc7e402 (patch)
tree1772fb6d3da40594e429a21dec3057beb743ddbd
parentdfe0a1eb898dcee72dc113737c79bff588383130 (diff)
downloadbrew-5f5e68975244beab041ca4aee4b8a83f6dc7e402.tar.bz2
Remember `--ignore-dependencies` when installing and upgrading
-rw-r--r--Library/Homebrew/cmd/upgrade.rb1
-rw-r--r--Library/Homebrew/formula_installer.rb2
-rw-r--r--Library/Homebrew/tab.rb3
3 files changed, 6 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb
index de886ff3d..bc6acd217 100644
--- a/Library/Homebrew/cmd/upgrade.rb
+++ b/Library/Homebrew/cmd/upgrade.rb
@@ -128,6 +128,7 @@ module Homebrew
if tab
fi.installed_as_dependency = tab.installed_as_dependency
fi.installed_on_request ||= tab.installed_on_request
+ fi.ignore_deps = tab.ignored_dependencies
end
fi.prelude
diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb
index b5c5e7fb5..10ca57942 100644
--- a/Library/Homebrew/formula_installer.rb
+++ b/Library/Homebrew/formula_installer.rb
@@ -333,6 +333,7 @@ class FormulaInstaller
tab = Tab.for_keg(keg)
tab.installed_as_dependency = installed_as_dependency
tab.installed_on_request = installed_on_request
+ tab.ignored_dependencies = ignore_deps?
tab.write
end
@@ -891,6 +892,7 @@ class FormulaInstaller
tab.installed_as_dependency = installed_as_dependency
tab.installed_on_request = installed_on_request
tab.aliases = formula.aliases
+ tab.ignored_dependencies = ignore_deps?
tab.write
end
diff --git a/Library/Homebrew/tab.rb b/Library/Homebrew/tab.rb
index aa0208d51..a88dda828 100644
--- a/Library/Homebrew/tab.rb
+++ b/Library/Homebrew/tab.rb
@@ -19,6 +19,7 @@ class Tab < OpenStruct
build = formula.build
attributes = {
"homebrew_version" => HOMEBREW_VERSION,
+ "ignored_dependencies" => false,
"used_options" => build.used_options.as_flags,
"unused_options" => build.unused_options.as_flags,
"tabfile" => formula.prefix/FILENAME,
@@ -177,6 +178,7 @@ class Tab < OpenStruct
"unused_options" => [],
"built_as_bottle" => false,
"installed_as_dependency" => false,
+ "ignored_dependencies" => false,
"installed_on_request" => true,
"poured_from_bottle" => false,
"time" => nil,
@@ -322,6 +324,7 @@ class Tab < OpenStruct
"poured_from_bottle" => poured_from_bottle,
"installed_as_dependency" => installed_as_dependency,
"installed_on_request" => installed_on_request,
+ "ignored_dependencies" => ignored_dependencies,
"changed_files" => changed_files&.map(&:to_s),
"time" => time,
"source_modified_time" => source_modified_time.to_i,