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

Download strategies require a usable name

Browse Source 
We should handle this case in some predictable way, but until we do,
let's raise a more appropriate exception. It would also be good to get
rid of the duplication here.
This commit is contained in:
Jack Nagel 2013-04-07 00:49:56 -05:00
parent 2288f63197
commit 8cf0f34aa7
1 changed files with 20 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
Library/Homebrew/download_strategy.rb
View File

@ -209,9 +209,14 @@ class SubversionDownloadStrategy < AbstractDownloadStrategy
def initialize name, package def initialize name, package
super super
@@svn ||= 'svn' @@svn ||= 'svn'
@unique_token="#{name}--svn" unless name.to_s.empty? or name == '__UNKNOWN__'
@unique_token += "-HEAD" if ARGV.include? '--HEAD' if name.to_s.empty? || name == '__UNKNOWN__'
@co=HOMEBREW_CACHE+@unique_token raise NotImplementedError, "strategy requires a name parameter"
else
@co = HOMEBREW_CACHE + "#{name}--svn"
end
@co << "-HEAD" if ARGV.build_head?
end end
def cached_location def cached_location
@ -307,8 +312,12 @@ class GitDownloadStrategy < AbstractDownloadStrategy
def initialize name, package def initialize name, package
super super
@@git ||= 'git' @@git ||= 'git'
@unique_token="#{name}--git" unless name.to_s.empty? or name == '__UNKNOWN__'
@clone=HOMEBREW_CACHE+@unique_token if name.to_s.empty? || name == '__UNKNOWN__'
raise NotImplementedError, "strategy requires a name parameter"
else
@clone = HOMEBREW_CACHE + "#{name}--git"
end
end end
def cached_location def cached_location
@ -457,8 +466,12 @@ end
class CVSDownloadStrategy < AbstractDownloadStrategy class CVSDownloadStrategy < AbstractDownloadStrategy
def initialize name, package def initialize name, package
super super
@unique_token="#{name}--cvs" unless name.to_s.empty? or name == '__UNKNOWN__'
@co=HOMEBREW_CACHE+@unique_token if name.to_s.empty? || name == '__UNKNOWN__'
raise NotImplementedError, "strategy requires a name parameter"
else
@co = HOMEBREW_CACHE + "#{name}--cvs"
end
end end
def cached_location; @co; end def cached_location; @co; end