aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/resource.rb
diff options
context:
space:
mode:
authorJack Nagel2013-10-30 00:43:10 -0500
committerJack Nagel2013-10-30 10:16:20 -0500
commit4ee541b9e4bce5a875414c5289c1a6a7b311816d (patch)
tree346e0422f8b9eaab5a220432aff5e1adcff3f4d1 /Library/Homebrew/resource.rb
parentf2a816fbf2acd88bcc987401bc2e4f0e4889c1e1 (diff)
downloadhomebrew-4ee541b9e4bce5a875414c5289c1a6a7b311816d.tar.bz2
Resource: push conditional down into #verify_download_integrity
Diffstat (limited to 'Library/Homebrew/resource.rb')
-rw-r--r--Library/Homebrew/resource.rb7
1 files changed, 4 insertions, 3 deletions
diff --git a/Library/Homebrew/resource.rb b/Library/Homebrew/resource.rb
index c7d73ffa7..8fd9dc7b3 100644
--- a/Library/Homebrew/resource.rb
+++ b/Library/Homebrew/resource.rb
@@ -48,8 +48,7 @@ class Resource
# If block is given, yield to that block
# A target or a block must be given, but not both
def stage(target=nil)
- fetched = fetch
- verify_download_integrity(fetched) if fetched.respond_to?(:file?) and fetched.file?
+ verify_download_integrity(fetch)
mktemp(download_name) do
downloader.stage
if block_given?
@@ -75,7 +74,9 @@ class Resource
end
def verify_download_integrity fn
- fn.verify_checksum(checksum)
+ if fn.respond_to?(:file?) && fn.file?
+ fn.verify_checksum(checksum)
+ end
rescue ChecksumMissingError
opoo "Cannot verify integrity of #{fn.basename}"
puts "A checksum was not provided for this resource"