Merge branch 'Homebrew:master' into mohammad
This commit is contained in:
commit
3d66ec1a81
@ -161,7 +161,7 @@ class DependencyCollector
|
|||||||
elsif strategy <= FossilDownloadStrategy
|
elsif strategy <= FossilDownloadStrategy
|
||||||
Dependency.new("fossil", tags)
|
Dependency.new("fossil", tags)
|
||||||
elsif strategy <= BazaarDownloadStrategy
|
elsif strategy <= BazaarDownloadStrategy
|
||||||
Dependency.new("bazaar", tags)
|
Dependency.new("breezy", tags)
|
||||||
elsif strategy <= CVSDownloadStrategy
|
elsif strategy <= CVSDownloadStrategy
|
||||||
cvs_dep_if_needed(tags)
|
cvs_dep_if_needed(tags)
|
||||||
elsif strategy < AbstractDownloadStrategy
|
elsif strategy < AbstractDownloadStrategy
|
||||||
|
@ -1280,7 +1280,7 @@ class BazaarDownloadStrategy < VCSDownloadStrategy
|
|||||||
|
|
||||||
def env
|
def env
|
||||||
{
|
{
|
||||||
"PATH" => PATH.new(Formula["bazaar"].opt_bin, ENV.fetch("PATH")),
|
"PATH" => PATH.new(Formula["breezy"].opt_bin, ENV.fetch("PATH")),
|
||||||
"BZR_HOME" => HOMEBREW_TEMP,
|
"BZR_HOME" => HOMEBREW_TEMP,
|
||||||
}
|
}
|
||||||
end
|
end
|
||||||
|
Loading…
x
Reference in New Issue
Block a user