Skip to content

Commit

Permalink
fix warnings: ambiguous splat
Browse files Browse the repository at this point in the history
Signed-off-by: Adam Vandenberg <[email protected]>
  • Loading branch information
jamie authored and adamv committed Oct 30, 2010
1 parent 0c78126 commit d778aa6
Show file tree
Hide file tree
Showing 4 changed files with 9 additions and 8 deletions.
4 changes: 2 additions & 2 deletions Library/Homebrew/download_strategy.rb
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ def expand_safe_system_args args
end

def quiet_safe_system *args
safe_system *expand_safe_system_args(args)
safe_system(*expand_safe_system_args(args))
end
end

Expand Down Expand Up @@ -209,7 +209,7 @@ def fetch_repo target, url, revision=nil, ignore_externals=false
args = _fetch_command svncommand, url, target
args << '-r' << revision if revision
args << '--ignore-externals' if ignore_externals
quiet_safe_system *args
quiet_safe_system(*args)
end

# Try HOMEBREW_SVN, a Homebrew-built svn, and finally the OS X system svn.
Expand Down
7 changes: 4 additions & 3 deletions Library/Homebrew/formula.rb
Original file line number Diff line number Diff line change
Expand Up @@ -496,8 +496,9 @@ def patch
return if patch_list.empty?

ohai "Downloading patches"
# downloading all at once is much more efficient, espeically for FTP
curl *(patch_list.collect{|p| p[:curl_args]}.select{|p| p}.flatten)
# downloading all at once is much more efficient, especially for FTP
patches = patch_list.collect{|p| p[:curl_args]}.select{|p| p}.flatten
curl(*patches)

ohai "Patching"
patch_list.each do |p|
Expand Down Expand Up @@ -543,7 +544,7 @@ def #{attr}(val=nil)

attr_rw :version, :homepage, :specs, :deps, :external_deps
attr_rw :keg_only_reason, :skip_clean_all
attr_rw *CHECKSUM_TYPES
attr_rw(*CHECKSUM_TYPES)

def head val=nil, specs=nil
return @head if val.nil?
Expand Down
2 changes: 1 addition & 1 deletion Library/Homebrew/utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def exec_editor *args
# we split the editor because especially on mac "mate -w" is common
# but we still want to use the comma-delimited version of exec because then
# we don't have to escape args, and escaping 100% is tricky
exec *(editor.split+args)
exec(*(editor.split+args))
end

# GZips the given path, and returns the gzipped file
Expand Down
4 changes: 2 additions & 2 deletions bin/brew
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,7 @@ begin
path
end
end
exec_editor *paths
exec_editor(*paths)
end

when 'up', 'update'
Expand Down Expand Up @@ -225,7 +225,7 @@ begin
elsif ARGV.named.empty?
raise UsageError
else
exec_editor *ARGV.named.collect {|name| make name}
exec_editor(*ARGV.named.collect {|name| make name})
end

when 'diy', 'configure'
Expand Down

0 comments on commit d778aa6

Please sign in to comment.