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

Make FileUtils extension available globally

Browse Source 
Now that we are monkeypatching copy_metadata, we should load our
extension up front for consistency.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
This commit is contained in:
Jack Nagel 2012-09-27 16:22:01 -05:00
parent 8d3ff5691d
commit 6ebcccdcc5
3 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Library/Homebrew/formula.rb
View File

@ -3,7 +3,6 @@ require 'dependencies'
require 'formula_support' require 'formula_support'
require 'hardware' require 'hardware'
require 'bottles' require 'bottles'
require 'extend/fileutils'
require 'patches' require 'patches'
require 'compilers' require 'compilers'
require 'build_environment' require 'build_environment'

2
Library/Homebrew/global.rb
View File

@ -1,3 +1,4 @@
require 'extend/fileutils'
require 'extend/pathname' require 'extend/pathname'
require 'extend/ARGV' require 'extend/ARGV'
require 'extend/string' require 'extend/string'
@ -75,7 +76,6 @@ HOMEBREW_USER_AGENT = "Homebrew #{HOMEBREW_VERSION} (Ruby #{RUBY_VERSION}-#{RUBY
HOMEBREW_CURL_ARGS = '-qf#LA' HOMEBREW_CURL_ARGS = '-qf#LA'
require 'fileutils'
module Homebrew extend self module Homebrew extend self
include FileUtils include FileUtils

2
Library/Homebrew/test/testing_env.rb
View File

@ -7,6 +7,7 @@
ABS__FILE__=File.expand_path(__FILE__) ABS__FILE__=File.expand_path(__FILE__)
$:.push(File.expand_path(__FILE__+'/../..')) $:.push(File.expand_path(__FILE__+'/../..'))
require 'extend/fileutils'
require 'extend/pathname' require 'extend/pathname'
require 'extend/string' require 'extend/string'
require 'exceptions' require 'exceptions'
@ -31,7 +32,6 @@ at_exit { HOMEBREW_PREFIX.parent.rmtree }
# Test fixtures and files can be found relative to this path # Test fixtures and files can be found relative to this path
TEST_FOLDER = Pathname.new(ABS__FILE__).parent.realpath TEST_FOLDER = Pathname.new(ABS__FILE__).parent.realpath
require 'fileutils'
module Homebrew extend self module Homebrew extend self
include FileUtils include FileUtils
end end