Skip to content

Commit 3db7535

Browse files
committed
cask/cask_loader: fix future disable reason
1 parent 24fea90 commit 3db7535

File tree

1 file changed

+7
-6
lines changed

1 file changed

+7
-6
lines changed

Library/Homebrew/cask/cask_loader.rb

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -378,14 +378,15 @@ def load(config:)
378378
desc json_cask[:desc]
379379
homepage json_cask[:homepage]
380380

381-
if (deprecation_date = json_cask[:deprecation_date].presence)
382-
reason = DeprecateDisable.to_reason_string_or_symbol json_cask[:deprecation_reason], type: :cask
383-
deprecate! date: deprecation_date, because: reason
381+
if (date = json_cask[:deprecation_date].presence)
382+
because = DeprecateDisable.to_reason_string_or_symbol json_cask[:deprecation_reason], type: :cask
383+
deprecate! date:, because:
384384
end
385385

386-
if (disable_date = json_cask[:disable_date].presence)
387-
reason = DeprecateDisable.to_reason_string_or_symbol json_cask[:disable_reason], type: :cask
388-
disable! date: disable_date, because: reason
386+
if (date = json_cask[:disable_date].presence)
387+
disable_reason = json_cask[:disable_reason].presence || json_cask[:deprecation_reason]
388+
because = DeprecateDisable.to_reason_string_or_symbol disable_reason, type: :cask
389+
disable! date:, because:
389390
end
390391

391392
auto_updates json_cask[:auto_updates] unless json_cask[:auto_updates].nil?

0 commit comments

Comments
 (0)