diff options
| author | Charlie Sharpsteen | 2012-06-25 09:20:18 -0800 |
|---|---|---|
| committer | Charlie Sharpsteen | 2012-06-25 09:20:18 -0800 |
| commit | f165e0cf5fe283f9d4e61900ddd749540e82b231 (patch) | |
| tree | 2a3324f65690644172ca6dedab7ae276ecc84fd3 /Library/Homebrew | |
| parent | b9f4b682b507d093bb779a5d5355edc93c22b3cb (diff) | |
| download | brew-f165e0cf5fe283f9d4e61900ddd749540e82b231.tar.bz2 | |
brew-upgrade: Respect --ignore-dependencies flag
Passing `--ignore-dependencies` to `brew upgrade` will now have the desired
effect.
Diffstat (limited to 'Library/Homebrew')
| -rw-r--r-- | Library/Homebrew/cmd/upgrade.rb | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/Library/Homebrew/cmd/upgrade.rb b/Library/Homebrew/cmd/upgrade.rb index 566649ed3..9a2448066 100644 --- a/Library/Homebrew/cmd/upgrade.rb +++ b/Library/Homebrew/cmd/upgrade.rb @@ -29,14 +29,16 @@ module Homebrew extend self end end - # Expand the outdated list to include outdated dependencies then sort and - # reduce such that dependencies are installed first and installation is not - # attempted twice. Sorting is implicit the way `recursive_deps` returns - # root dependencies at the head of the list and `uniq` keeps the first - # element it encounters and discards the rest. - outdated.map!{ |f| f.recursive_deps.reject{ |d| d.installed?} << f } - outdated.flatten! - outdated.uniq! + unless ARGV.include? '--ignore-dependencies' + # Expand the outdated list to include outdated dependencies then sort and + # reduce such that dependencies are installed first and installation is not + # attempted twice. Sorting is implicit the way `recursive_deps` returns + # root dependencies at the head of the list and `uniq` keeps the first + # element it encounters and discards the rest. + outdated.map!{ |f| f.recursive_deps.reject{ |d| d.installed?} << f } + outdated.flatten! + outdated.uniq! + end if outdated.length > 1 oh1 "Upgrading #{outdated.length} outdated package#{outdated.length.plural_s}, with result:" |
