diff options
| author | Jack Nagel | 2013-05-16 15:25:09 -0500 |
|---|---|---|
| committer | Jack Nagel | 2013-05-16 15:26:25 -0500 |
| commit | f6329e44d02cafc5ee0aaec38b2ca3e1e078ce71 (patch) | |
| tree | 3fc08555e4ab9db13f62d1836b5803a9c5e04664 | |
| parent | 61764b477bc30449e27ca0d934a5d7b878b45eaa (diff) | |
| download | homebrew-f6329e44d02cafc5ee0aaec38b2ca3e1e078ce71.tar.bz2 | |
CurlDownloadStrategy: remove "tarball_path" accessor
This information is already exposed as "cached_location", which is
common to all download strategies.
| -rwxr-xr-x | Library/Contributions/cmd/brew-mirror-check.rb | 7 | ||||
| -rw-r--r-- | Library/Homebrew/download_strategy.rb | 1 |
2 files changed, 3 insertions, 5 deletions
diff --git a/Library/Contributions/cmd/brew-mirror-check.rb b/Library/Contributions/cmd/brew-mirror-check.rb index ed8e5364f..4fa0defa0 100755 --- a/Library/Contributions/cmd/brew-mirror-check.rb +++ b/Library/Contributions/cmd/brew-mirror-check.rb @@ -9,14 +9,13 @@ class Formula # Force the downloader to attempt the download by removing the tarball if # it is allready cached. - tarball_path = downloader.tarball_path - tarball_path.unlink if tarball_path.exist? + cached_download.unlink if cached_download.exist? - fetched = downloader.fetch + downloader.fetch rescue StandardError opoo "Failed to fetch from URL: #{url}" else - verify_download_integrity fetched if fetched.kind_of? Pathname + verify_download_integrity(cached_download) if cached_download.file? end end diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb index 67261af2a..589de6e89 100644 --- a/Library/Homebrew/download_strategy.rb +++ b/Library/Homebrew/download_strategy.rb @@ -31,7 +31,6 @@ class AbstractDownloadStrategy end class CurlDownloadStrategy < AbstractDownloadStrategy - attr_reader :tarball_path attr_accessor :local_bottle_path def initialize name, package |
