diff options
| author | Jack Nagel | 2012-03-06 19:23:51 -0600 |
|---|---|---|
| committer | Jack Nagel | 2012-03-06 19:23:51 -0600 |
| commit | 67c3f1b2b4e4697af93a3e78e31fd00df2d02966 (patch) | |
| tree | fd43a8a91845db343f0e244a1ba38fb76fab5ccc | |
| parent | 158efd8c9a61b91caccdcb2e6b98f7d649cae93c (diff) | |
| download | brew-67c3f1b2b4e4697af93a3e78e31fd00df2d02966.tar.bz2 | |
Extend FileUtils rather than include it
Fixes Homebrew/homebrew#10729.
Signed-off-by: Jack Nagel <jacknagel@gmail.com>
| -rw-r--r-- | Library/Homebrew/extend/fileutils.rb | 5 | ||||
| -rw-r--r-- | Library/Homebrew/formula.rb | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/Library/Homebrew/extend/fileutils.rb b/Library/Homebrew/extend/fileutils.rb index 89c7de2fe..eb08ffed4 100644 --- a/Library/Homebrew/extend/fileutils.rb +++ b/Library/Homebrew/extend/fileutils.rb @@ -1,8 +1,7 @@ require 'fileutils' # We enhance FileUtils to make our Formula code more readable. -module Homebrew::FileUtils - include FileUtils +module FileUtils extend self # Create a temporary directory then yield. When the block returns, # recursively delete the temporary directory. @@ -29,7 +28,7 @@ module Homebrew::FileUtils # A version of mkdir that also changes to that folder in a block. def mkdir name, &block - super(name) + FileUtils.mkdir(name) if block_given? chdir name do yield diff --git a/Library/Homebrew/formula.rb b/Library/Homebrew/formula.rb index 0e2e96e50..8369d364d 100644 --- a/Library/Homebrew/formula.rb +++ b/Library/Homebrew/formula.rb @@ -6,7 +6,7 @@ require 'extend/fileutils' # Derive and define at least @url, see Library/Formula for examples class Formula - include Homebrew::FileUtils + include FileUtils attr_reader :name, :path, :url, :version, :homepage, :specs, :downloader attr_reader :standard, :unstable |