Use the proper path when purging metadata

This commit is contained in:
L. E. Segovia 2017-11-28 14:29:53 +00:00
parent 8386b9384c
commit 2ff114bc32

View File

@ -452,7 +452,7 @@ module Hbc
ohai "Purging files for version #{@cask.version} of Cask #{@cask}" ohai "Purging files for version #{@cask.version} of Cask #{@cask}"
# versioned staged distribution # versioned staged distribution
if version_is_latest? if upgrade? && version_is_latest?
staged_path = backup_path(@cask.staged_path) staged_path = backup_path(@cask.staged_path)
else else
staged_path = @cask.staged_path staged_path = @cask.staged_path
@ -463,7 +463,7 @@ module Hbc
# Homebrew-Cask metadata # Homebrew-Cask metadata
if @cask.metadata_versioned_path.respond_to?(:children) && if @cask.metadata_versioned_path.respond_to?(:children) &&
@cask.metadata_versioned_path.exist? && @cask.metadata_versioned_path.exist? &&
!version_is_latest? !(upgrade? && version_is_latest?)
@cask.metadata_versioned_path.children.each do |subdir| @cask.metadata_versioned_path.children.each do |subdir|
unless PERSISTENT_METADATA_SUBDIRS.include?(subdir.basename) unless PERSISTENT_METADATA_SUBDIRS.include?(subdir.basename)
gain_permissions_remove(subdir) gain_permissions_remove(subdir)