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

Don't version VCS checkout directories.

Browse Source 
While tarballs are versioned to prevent conflicts when newer ones are downloaded,
we shouldn't be versioning the name of the VCS checkout when a formula uses
"HEAD" or a stable commit.

Append the name of the vcs system to the checkout path, in case a project changes
vcs providers, to prevent future conflicts.
This commit is contained in:
Adam Vandenberg 2010-07-06 08:29:02 -07:00
parent 07ce6d6e16
commit 0a018deb93
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Library/Homebrew/download_strategy.rb
View File

@ -5,7 +5,6 @@ class AbstractDownloadStrategy
@spec = specs.keys.first # only use first spec @spec = specs.keys.first # only use first spec
@ref = specs.values.first @ref = specs.values.first
end end
@unique_token="#{name}-#{version}" unless name.to_s.empty? or name == '__UNKNOWN__'
end end
def expand_safe_system_args args def expand_safe_system_args args
@ -34,6 +33,7 @@ class CurlDownloadStrategy <AbstractDownloadStrategy
def initialize url, name, version, specs def initialize url, name, version, specs
super super
@unique_token="#{name}-#{version}" unless name.to_s.empty? or name == '__UNKNOWN__'
if @unique_token if @unique_token
@tarball_path=HOMEBREW_CACHE+(@unique_token+ext) @tarball_path=HOMEBREW_CACHE+(@unique_token+ext)
else else
@ -156,6 +156,7 @@ end
class SubversionDownloadStrategy <AbstractDownloadStrategy class SubversionDownloadStrategy <AbstractDownloadStrategy
def initialize url, name, version, specs def initialize url, name, version, specs
super super
@unique_token="#{name}--svn" unless name.to_s.empty? or name == '__UNKNOWN__'
@co=HOMEBREW_CACHE+@unique_token @co=HOMEBREW_CACHE+@unique_token
end end
@ -238,6 +239,7 @@ end
class GitDownloadStrategy <AbstractDownloadStrategy class GitDownloadStrategy <AbstractDownloadStrategy
def initialize url, name, version, specs def initialize url, name, version, specs
super super
@unique_token="#{name}--git" unless name.to_s.empty? or name == '__UNKNOWN__'
@clone=HOMEBREW_CACHE+@unique_token @clone=HOMEBREW_CACHE+@unique_token
end end
@ -287,6 +289,7 @@ end
class CVSDownloadStrategy <AbstractDownloadStrategy class CVSDownloadStrategy <AbstractDownloadStrategy
def initialize url, name, version, specs def initialize url, name, version, specs
super super
@unique_token="#{name}--cvs" unless name.to_s.empty? or name == '__UNKNOWN__'
@co=HOMEBREW_CACHE+@unique_token @co=HOMEBREW_CACHE+@unique_token
end end
@ -336,6 +339,7 @@ end
class MercurialDownloadStrategy <AbstractDownloadStrategy class MercurialDownloadStrategy <AbstractDownloadStrategy
def initialize url, name, version, specs def initialize url, name, version, specs
super super
@unique_token="#{name}--hg" unless name.to_s.empty? or name == '__UNKNOWN__'
@clone=HOMEBREW_CACHE+@unique_token @clone=HOMEBREW_CACHE+@unique_token
end end
@ -380,6 +384,7 @@ end
class BazaarDownloadStrategy <AbstractDownloadStrategy class BazaarDownloadStrategy <AbstractDownloadStrategy
def initialize url, name, version, specs def initialize url, name, version, specs
super super
@unique_token="#{name}--bzr" unless name.to_s.empty? or name == '__UNKNOWN__'
@clone=HOMEBREW_CACHE+@unique_token @clone=HOMEBREW_CACHE+@unique_token
end end