diff options
| author | Uladzislau Shablinski | 2016-07-17 11:56:13 +0300 |
|---|---|---|
| committer | Xu Cheng | 2016-07-17 16:56:13 +0800 |
| commit | 092d4712a1d00bc08eb0515d8e61f7859c7a2de0 (patch) | |
| tree | 3ab993a2f1ad0b31a4670858e3d7d0407e822d1e | |
| parent | 2633f888d40314dee794dfba614c6e42f97f8c8a (diff) | |
| download | brew-092d4712a1d00bc08eb0515d8e61f7859c7a2de0.tar.bz2 | |
Update commit when resolving the formula (#536)
| -rw-r--r-- | Library/Homebrew/extend/ARGV.rb | 4 | ||||
| -rw-r--r-- | Library/Homebrew/formulary.rb | 1 | ||||
| -rw-r--r-- | Library/Homebrew/postinstall.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/test.rb | 2 |
4 files changed, 7 insertions, 2 deletions
diff --git a/Library/Homebrew/extend/ARGV.rb b/Library/Homebrew/extend/ARGV.rb index beee47038..2da6141c7 100644 --- a/Library/Homebrew/extend/ARGV.rb +++ b/Library/Homebrew/extend/ARGV.rb @@ -32,6 +32,10 @@ module HomebrewArgvExtension resolved_spec = spec(nil) || tab.spec f.set_active_spec(resolved_spec) if f.send(resolved_spec) f.build = tab + if f.head? && tab.tabfile + k = Keg.new(tab.tabfile.parent) + f.version.update_commit(k.version.version.commit) + end end f else diff --git a/Library/Homebrew/formulary.rb b/Library/Homebrew/formulary.rb index 425443778..20f115f13 100644 --- a/Library/Homebrew/formulary.rb +++ b/Library/Homebrew/formulary.rb @@ -246,6 +246,7 @@ class Formulary end end f.build = tab + f.version.update_commit(keg.version.version.commit) if f.head? f end diff --git a/Library/Homebrew/postinstall.rb b/Library/Homebrew/postinstall.rb index 14e578128..0b6d8f6b0 100644 --- a/Library/Homebrew/postinstall.rb +++ b/Library/Homebrew/postinstall.rb @@ -11,7 +11,7 @@ begin trap("INT", old_trap) - formula = ARGV.formulae.first + formula = ARGV.resolved_formulae.first formula.extend(Debrew::Formula) if ARGV.debug? formula.run_post_install rescue Exception => e diff --git a/Library/Homebrew/test.rb b/Library/Homebrew/test.rb index 796ce0901..ffffa1837 100644 --- a/Library/Homebrew/test.rb +++ b/Library/Homebrew/test.rb @@ -19,7 +19,7 @@ begin trap("INT", old_trap) - formula = ARGV.formulae.first + formula = ARGV.resolved_formulae.first formula.extend(Homebrew::Assertions) formula.extend(Debrew::Formula) if ARGV.debug? |