diff options
| author | Markus Reiter | 2016-11-21 10:43:15 +0100 |
|---|---|---|
| committer | GitHub | 2016-11-21 10:43:15 +0100 |
| commit | c7267b123d38d1c96c2ca786c942255d2417cd86 (patch) | |
| tree | 4aa03848504af02e9254397aff8175d18f04a781 /Library | |
| parent | cc7541cbc43fed20626f654dcea74c2a4951706a (diff) | |
| parent | bd9755fd78c4480dfb393c8317f685ec770e076a (diff) | |
| download | brew-c7267b123d38d1c96c2ca786c942255d2417cd86.tar.bz2 | |
Merge pull request #1502 from reitermarkus/load-metadata-cask-file
Load cask file in `.metadata` directory directly.
Diffstat (limited to 'Library')
| -rw-r--r-- | Library/Homebrew/cask/lib/hbc/cli/reinstall.rb | 2 | ||||
| -rw-r--r-- | Library/Homebrew/cask/lib/hbc/cli/uninstall.rb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb b/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb index ac514bd50..3560a4795 100644 --- a/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb +++ b/Library/Homebrew/cask/lib/hbc/cli/reinstall.rb @@ -19,7 +19,7 @@ module Hbc "Casks", "#{cask_token}.rb") # use the same cask file that was used for installation, if possible - installed_cask = Hbc.load(latest_installed_cask_file) if latest_installed_cask_file.exist? + installed_cask = CaskLoader.load_from_file(latest_installed_cask_file) if latest_installed_cask_file.exist? end # Always force uninstallation, ignore method parameter diff --git a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb b/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb index 2bebb97b0..d74b59d4c 100644 --- a/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb +++ b/Library/Homebrew/cask/lib/hbc/cli/uninstall.rb @@ -20,7 +20,7 @@ module Hbc "Casks", "#{cask_token}.rb") # use the same cask file that was used for installation, if possible - cask = Hbc.load(latest_installed_cask_file) if latest_installed_cask_file.exist? + cask = CaskLoader.load_from_file(latest_installed_cask_file) if latest_installed_cask_file.exist? end Installer.new(cask, force: force).uninstall |