diff options
| author | Mike McQuaid | 2016-10-01 12:24:19 +0100 |
|---|---|---|
| committer | GitHub | 2016-10-01 12:24:19 +0100 |
| commit | 98e7fb6b60c9463bd7d259bb16a00244e95bbc82 (patch) | |
| tree | be0bf046e744132aac612780fdc847e310ea0060 | |
| parent | c64ce3ef07dbbba79f311c1dd928c743fc897667 (diff) | |
| parent | 25df0c03d6abd79fbc103f3be9df38d48bd4f938 (diff) | |
| download | brew-98e7fb6b60c9463bd7d259bb16a00244e95bbc82.tar.bz2 | |
Merge pull request #1052 from sjackman/store-formula
Store the formula used to build the keg in the keg
| -rw-r--r-- | Library/Homebrew/cmd/list.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/formula_installer.rb | 6 | ||||
| -rw-r--r-- | Library/Homebrew/test/test_formula_installer.rb | 1 |
3 files changed, 9 insertions, 0 deletions
diff --git a/Library/Homebrew/cmd/list.rb b/Library/Homebrew/cmd/list.rb index 4fdd8a85e..d2eebb5f1 100644 --- a/Library/Homebrew/cmd/list.rb +++ b/Library/Homebrew/cmd/list.rb @@ -140,6 +140,8 @@ class PrettyListing # dylibs have multiple symlinks and we don't care about them (pnn.extname == ".dylib" || pnn.extname == ".pc") && !pnn.symlink? end + when ".brew" + # Ignore .brew else if pn.directory? if pn.symlink? diff --git a/Library/Homebrew/formula_installer.rb b/Library/Homebrew/formula_installer.rb index 3738c3784..652f87ae3 100644 --- a/Library/Homebrew/formula_installer.rb +++ b/Library/Homebrew/formula_installer.rb @@ -259,6 +259,12 @@ class FormulaInstaller compute_and_install_dependencies if not_pouring && !ignore_deps? build clean + + # Store the formula used to build the keg in the keg. + s = formula.path.read.gsub(/ bottle do.+?end\n\n?/m, "") + brew_prefix = formula.prefix/".brew" + brew_prefix.mkdir + Pathname(brew_prefix/"#{formula.name}.rb").atomic_write(s) end build_bottle_postinstall if build_bottle? diff --git a/Library/Homebrew/test/test_formula_installer.rb b/Library/Homebrew/test/test_formula_installer.rb index da0404c35..5b937d1df 100644 --- a/Library/Homebrew/test/test_formula_installer.rb +++ b/Library/Homebrew/test/test_formula_installer.rb @@ -58,6 +58,7 @@ class InstallTests < Homebrew::TestCase bin = HOMEBREW_PREFIX+"bin" assert_predicate bin, :directory? assert_equal 3, bin.children.length + assert_predicate f.prefix/".brew/testball.rb", :readable? end end |
