mirrors/brew
1
0
Fork 0
mirror of https://github.com/Homebrew/brew.git synced 2025-07-14 16:09:03 +08:00
Code Issues Packages Projects Releases Wiki Activity

MercurialDownloadStrategy can find hg again

Browse Source 
Was broken after superenv PATH modification.

Fixes Homebrew/homebrew#15078.
This commit is contained in:
Max Howell 2012-09-25 10:11:13 -04:00
parent a217b03952
commit d1be193cfe
1 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Library/Homebrew/download_strategy.rb
View File

@ -458,19 +458,27 @@ class MercurialDownloadStrategy < AbstractDownloadStrategy
def cached_location; @clone; end def cached_location; @clone; end
def hgpath
@path ||= if which "hg"
'hg'
else
"#{HOMEBREW_PREFIX}/bin/hg"
end
end
def fetch def fetch
raise "You must install Mercurial: brew install mercurial" unless which "hg" raise "You must: brew install hg" unless File.file?(hgpath)
ohai "Cloning #{@url}" ohai "Cloning #{@url}"
unless @clone.exist? unless @clone.exist?
url=@url.sub(%r[^hg://], '') url=@url.sub(%r[^hg://], '')
safe_system 'hg', 'clone', url, @clone safe_system hgpath, 'clone', url, @clone
else else
puts "Updating #{@clone}" puts "Updating #{@clone}"
Dir.chdir(@clone) do Dir.chdir(@clone) do
safe_system 'hg', 'pull' safe_system hgpath, 'pull'
safe_system 'hg', 'update' safe_system hgpath, 'update'
end end
end end
end end
@ -480,9 +488,9 @@ class MercurialDownloadStrategy < AbstractDownloadStrategy
Dir.chdir @clone do Dir.chdir @clone do
if @spec and @ref if @spec and @ref
ohai "Checking out #{@spec} #{@ref}" ohai "Checking out #{@spec} #{@ref}"
safe_system 'hg', 'archive', '--subrepos', '-y', '-r', @ref, '-t', 'files', dst safe_system hgpath, 'archive', '--subrepos', '-y', '-r', @ref, '-t', 'files', dst
else else
safe_system 'hg', 'archive', '--subrepos', '-y', '-t', 'files', dst safe_system hgpath, 'archive', '--subrepos', '-y', '-t', 'files', dst
end end
end end
end end