From e6b30e406567f7f5d1b3c8227293caba4b92dbb5 Mon Sep 17 00:00:00 2001 From: Bo Anderson Date: Fri, 21 Aug 2020 18:36:00 +0100 Subject: [PATCH] cask/dsl/depends_on: fix missing require --- Library/Homebrew/cask/dsl/depends_on.rb | 4 +++- Library/Homebrew/global.rb | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Library/Homebrew/cask/dsl/depends_on.rb b/Library/Homebrew/cask/dsl/depends_on.rb index b5aa5ff739..257ff39783 100644 --- a/Library/Homebrew/cask/dsl/depends_on.rb +++ b/Library/Homebrew/cask/dsl/depends_on.rb @@ -1,5 +1,7 @@ # frozen_string_literal: true +require "requirements/macos_requirement" + module Cask class DSL class DependsOn < DelegateClass(Hash) @@ -58,7 +60,7 @@ module Cask else MacOSRequirement.new([args.first], comparator: "==") end - rescue + rescue MacOSVersionError raise "invalid 'depends_on macos' value: #{args.first.inspect}" end end diff --git a/Library/Homebrew/global.rb b/Library/Homebrew/global.rb index f0b8b55059..7a16ac59b7 100644 --- a/Library/Homebrew/global.rb +++ b/Library/Homebrew/global.rb @@ -42,6 +42,7 @@ require "os" require "context" require "extend/pathname" require "extend/predicable" +require "extend/module" require "cli/args" require "messages" @@ -121,7 +122,6 @@ end.compact.freeze require "set" -require "extend/module" require "extend/string" require "active_support/core_ext/object/blank" require "active_support/core_ext/hash/deep_merge"