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

download_strategy.ry: Improve Bazaar efficiency

Browse Source 
Bazaar download strategy tried to re-download everything on "export" as a
checkout is used. See:

 https://answers.launchpad.net/bzr/+question/180269
 https://bugs.launchpad.net/bzr/+bug/897511

Related to issue Homebrew/homebrew#8774.

Closes Homebrew/homebrew#8863.

Signed-off-by: Charlie Sharpsteen <source@sharpsteen.net>
This commit is contained in:
Colin Hebert 2011-11-29 10:17:38 +01:00 committed by Charlie Sharpsteen
parent d9c3f19e6a
commit 3b8c98040c
1 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Library/Homebrew/download_strategy.rb
View File

@ -498,17 +498,22 @@ class BazaarDownloadStrategy < AbstractDownloadStrategy
end
def stage
dst=Dir.getwd
Dir.chdir @clone do
if @spec and @ref
ohai "Checking out #{@spec} #{@ref}"
Dir.chdir @clone do
safe_system 'bzr', 'export', '-r', @ref, dst
end
else
safe_system 'bzr', 'export', dst
end
end
# FIXME: The export command doesn't work on checkouts
# See https://bugs.launchpad.net/bzr/+bug/897511
FileUtils.cp_r Dir[@clone+"{.}"], Dir.pwd
FileUtils.rm_r Dir[Dir.pwd+"/.bzr"]
#dst=Dir.getwd
#Dir.chdir @clone do
# if @spec and @ref
# ohai "Checking out #{@spec} #{@ref}"
# Dir.chdir @clone do
# safe_system 'bzr', 'export', '-r', @ref, dst
# end
# else
# safe_system 'bzr', 'export', dst
# end
#end
end
end