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

Merge pull request #1951 from tma/reinstall-with-options

Browse Source 
Print warning when reinstalling with invalid options
This commit is contained in:
Mike McQuaid 2017-02-05 12:13:45 +01:00 committed by GitHub
commit da9dd0a863
2 changed files with 20 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/cmd/reinstall.rb
View File

@ -25,19 +25,21 @@ module Homebrew
backup keg
end
options = BuildOptions.new(Options.create(ARGV.flags_only), f.options).used_options
build_options = BuildOptions.new(Options.create(ARGV.flags_only), f.options)
options = build_options.used_options
options |= f.build.used_options
options &= f.options
fi = FormulaInstaller.new(f)
fi.options = options
fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?)
fi.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source?
fi.force_bottle = ARGV.force_bottle?
fi.interactive = ARGV.interactive?
fi.git = ARGV.git?
fi.verbose = ARGV.verbose?
fi.debug = ARGV.debug?
fi.options = options
fi.invalid_option_names = build_options.invalid_option_names
fi.build_bottle = ARGV.build_bottle? || (!f.bottled? && f.build.build_bottle?)
fi.build_from_source = ARGV.build_from_source? || ARGV.build_all_from_source?
fi.force_bottle = ARGV.force_bottle?
fi.interactive = ARGV.interactive?
fi.git = ARGV.git?
fi.verbose = ARGV.verbose?
fi.debug = ARGV.debug?
fi.prelude
oh1 "Reinstalling #{f.full_name} #{options.to_a.join " "}"

9
Library/Homebrew/test/reinstall_test.rb
View File

@ -12,4 +12,13 @@ class IntegrationCommandTestReinstall < IntegrationCommandTestCase
cmd("reinstall", "testball")
assert foo_dir.exist?
end
def test_reinstall_with_invalid_option
setup_test_formula "testball"
cmd("install", "testball", "--with-foo")
assert_match "testball: this formula has no --with-fo option so it will be ignored!",
cmd("reinstall", "testball", "--with-fo")
end
end