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

Move "Pouring" message to relevant download strategies

Browse Source
This commit is contained in:
Jack Nagel 2013-09-25 17:41:11 -05:00
parent cd3dc66696
commit e420683a07
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Library/Homebrew/download_strategy.rb
View File

@ -104,8 +104,6 @@ class CurlDownloadStrategy < AbstractDownloadStrategy
end end
def stage def stage
ohai "Pouring #{File.basename(tarball_path)}" if tarball_path.to_s.match bottle_regex
case tarball_path.compression_type case tarball_path.compression_type
when :zip when :zip
with_system_path { quiet_safe_system 'unzip', {:quiet_flag => '-qq'}, tarball_path } with_system_path { quiet_safe_system 'unzip', {:quiet_flag => '-qq'}, tarball_path }
@ -244,6 +242,11 @@ class CurlBottleDownloadStrategy < CurlDownloadStrategy
def tarball_path def tarball_path
@tarball_path ||= HOMEBREW_CACHE/"#{name}-#{resource.version}#{ext}" @tarball_path ||= HOMEBREW_CACHE/"#{name}-#{resource.version}#{ext}"
end end
def stage
ohai "Pouring #{tarball_path.basename}"
super
end
end end
# This strategy extracts local binary packages. # This strategy extracts local binary packages.
@ -252,6 +255,11 @@ class LocalBottleDownloadStrategy < CurlDownloadStrategy
super formula.name, formula.active_spec super formula.name, formula.active_spec
@tarball_path = local_bottle_path @tarball_path = local_bottle_path
end end
def stage
ohai "Pouring #{tarball_path.basename}"
super
end
end end
# S3DownloadStrategy downloads tarballs from AWS S3. # S3DownloadStrategy downloads tarballs from AWS S3.