mirror of
https://github.com/Homebrew/brew.git
synced 2025-07-14 16:09:03 +08:00
fix warnings: ambiguous splat
Signed-off-by: Adam Vandenberg <flangy@gmail.com>
This commit is contained in:
parent
6ff5e194c7
commit
b7fa82b28d
@ -24,7 +24,7 @@ class AbstractDownloadStrategy
|
|||||||
end
|
end
|
||||||
|
|
||||||
def quiet_safe_system *args
|
def quiet_safe_system *args
|
||||||
safe_system *expand_safe_system_args(args)
|
safe_system(*expand_safe_system_args(args))
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
@ -209,7 +209,7 @@ class SubversionDownloadStrategy <AbstractDownloadStrategy
|
|||||||
args = _fetch_command svncommand, url, target
|
args = _fetch_command svncommand, url, target
|
||||||
args << '-r' << revision if revision
|
args << '-r' << revision if revision
|
||||||
args << '--ignore-externals' if ignore_externals
|
args << '--ignore-externals' if ignore_externals
|
||||||
quiet_safe_system *args
|
quiet_safe_system(*args)
|
||||||
end
|
end
|
||||||
|
|
||||||
# Try HOMEBREW_SVN, a Homebrew-built svn, and finally the OS X system svn.
|
# Try HOMEBREW_SVN, a Homebrew-built svn, and finally the OS X system svn.
|
||||||
|
@ -496,8 +496,9 @@ EOF
|
|||||||
return if patch_list.empty?
|
return if patch_list.empty?
|
||||||
|
|
||||||
ohai "Downloading patches"
|
ohai "Downloading patches"
|
||||||
# downloading all at once is much more efficient, espeically for FTP
|
# downloading all at once is much more efficient, especially for FTP
|
||||||
curl *(patch_list.collect{|p| p[:curl_args]}.select{|p| p}.flatten)
|
patches = patch_list.collect{|p| p[:curl_args]}.select{|p| p}.flatten
|
||||||
|
curl(*patches)
|
||||||
|
|
||||||
ohai "Patching"
|
ohai "Patching"
|
||||||
patch_list.each do |p|
|
patch_list.each do |p|
|
||||||
@ -543,7 +544,7 @@ EOF
|
|||||||
|
|
||||||
attr_rw :version, :homepage, :specs, :deps, :external_deps
|
attr_rw :version, :homepage, :specs, :deps, :external_deps
|
||||||
attr_rw :keg_only_reason, :skip_clean_all
|
attr_rw :keg_only_reason, :skip_clean_all
|
||||||
attr_rw *CHECKSUM_TYPES
|
attr_rw(*CHECKSUM_TYPES)
|
||||||
|
|
||||||
def head val=nil, specs=nil
|
def head val=nil, specs=nil
|
||||||
return @head if val.nil?
|
return @head if val.nil?
|
||||||
|
@ -161,7 +161,7 @@ def exec_editor *args
|
|||||||
# we split the editor because especially on mac "mate -w" is common
|
# 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
|
# 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
|
# we don't have to escape args, and escaping 100% is tricky
|
||||||
exec *(editor.split+args)
|
exec(*(editor.split+args))
|
||||||
end
|
end
|
||||||
|
|
||||||
# GZips the given path, and returns the gzipped file
|
# GZips the given path, and returns the gzipped file
|
||||||
|
4
bin/brew
4
bin/brew
@ -167,7 +167,7 @@ begin
|
|||||||
path
|
path
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
exec_editor *paths
|
exec_editor(*paths)
|
||||||
end
|
end
|
||||||
|
|
||||||
when 'up', 'update'
|
when 'up', 'update'
|
||||||
@ -225,7 +225,7 @@ begin
|
|||||||
elsif ARGV.named.empty?
|
elsif ARGV.named.empty?
|
||||||
raise UsageError
|
raise UsageError
|
||||||
else
|
else
|
||||||
exec_editor *ARGV.named.collect {|name| make name}
|
exec_editor(*ARGV.named.collect {|name| make name})
|
||||||
end
|
end
|
||||||
|
|
||||||
when 'diy', 'configure'
|
when 'diy', 'configure'
|
||||||
|
Loading…
x
Reference in New Issue
Block a user