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

Merge pull request #1301 from ilovezfs/mountain-lion-depend-on-xz

Browse Source 
dependency_collector: need xz dep on <= macOS 10.8
This commit is contained in:
ilovezfs 2016-10-16 06:59:14 -07:00 committed by GitHub
commit 560bea6768
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Library/Homebrew/extend/os/mac/dependency_collector.rb
View File

@ -5,7 +5,7 @@ class DependencyCollector
end end
def xz_dep(tags) def xz_dep(tags)
return if MacOS.version >= :lion return if MacOS.version >= :mavericks
Dependency.new("xz", tags) Dependency.new("xz", tags)
end end
end end

10
Library/Homebrew/test/test_os_mac_dependency_collector.rb
View File

@ -15,7 +15,7 @@ class OSMacDependencyCollectorTests < Homebrew::TestCase
end end
def test_tar_needs_xz_dependency def test_tar_needs_xz_dependency
MacOS.stubs(:version).returns(MacOS::Version.new("10.7")) MacOS.stubs(:version).returns(MacOS::Version.new("10.9"))
refute DependencyCollector.tar_needs_xz_dependency? refute DependencyCollector.tar_needs_xz_dependency?
end end
@ -41,15 +41,15 @@ class OSMacDependencyCollectorTests < Homebrew::TestCase
assert_nil find_dependency("ant") assert_nil find_dependency("ant")
end end
def test_resource_dep_xz_url_pre_lion def test_resource_dep_xz_pre_mavericks
MacOS.stubs(:version).returns(MacOS::Version.new("10.6")) MacOS.stubs(:version).returns(MacOS::Version.new("10.8"))
resource = Resource.new resource = Resource.new
resource.url("http://example.com/foo.tar.xz") resource.url("http://example.com/foo.tar.xz")
assert_equal Dependency.new("xz", [:build]), @d.add(resource) assert_equal Dependency.new("xz", [:build]), @d.add(resource)
end end
def test_resource_dep_xz_lion_or_newer def test_resource_dep_xz_mavericks_or_newer
MacOS.stubs(:version).returns(MacOS::Version.new("10.7")) MacOS.stubs(:version).returns(MacOS::Version.new("10.9"))
resource = Resource.new resource = Resource.new
resource.url("http://example.com/foo.tar.xz") resource.url("http://example.com/foo.tar.xz")
assert_nil @d.add(resource) assert_nil @d.add(resource)