aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJack Nagel2014-12-22 00:43:02 -0500
committerJack Nagel2014-12-22 00:43:02 -0500
commit0236384c6d94ed6159383032f753de9d0ab2f74f (patch)
tree2e26aa20a6153d492b1e0666bf55a0d07eed9b52
parentc21ee72e4123c25db6395183475f9003f8a1a1f1 (diff)
downloadhomebrew-0236384c6d94ed6159383032f753de9d0ab2f74f.tar.bz2
Allow :module => "name" for CVS URLs
-rw-r--r--Library/Homebrew/download_strategy.rb16
1 files changed, 8 insertions, 8 deletions
diff --git a/Library/Homebrew/download_strategy.rb b/Library/Homebrew/download_strategy.rb
index 9cb56cd21..3f94ccbd1 100644
--- a/Library/Homebrew/download_strategy.rb
+++ b/Library/Homebrew/download_strategy.rb
@@ -642,6 +642,12 @@ class CVSDownloadStrategy < VCSDownloadStrategy
def initialize(name, resource)
super
@url = @url.sub(%r[^cvs://], "")
+
+ if meta.key?(:module)
+ @module = meta.fetch(:module)
+ else
+ @module, @url = split_url(@url)
+ end
end
def stage
@@ -659,15 +665,9 @@ class CVSDownloadStrategy < VCSDownloadStrategy
end
def clone_repo
- # URL of cvs cvs://:pserver:anoncvs@www.gccxml.org:/cvsroot/GCC_XML:gccxml
- # will become:
- # cvs -d :pserver:anoncvs@www.gccxml.org:/cvsroot/GCC_XML login
- # cvs -d :pserver:anoncvs@www.gccxml.org:/cvsroot/GCC_XML co gccxml
- mod, url = split_url(@url)
-
HOMEBREW_CACHE.cd do
- quiet_safe_system cvspath, { :quiet_flag => "-Q" }, "-d", url, "login"
- quiet_safe_system cvspath, { :quiet_flag => "-Q" }, "-d", url, "checkout", "-d", cache_filename, mod
+ quiet_safe_system cvspath, { :quiet_flag => "-Q" }, "-d", @url, "login"
+ quiet_safe_system cvspath, { :quiet_flag => "-Q" }, "-d", @url, "checkout", "-d", cache_filename, @module
end
end