WithoutSource should not treat .metadata as a staged_path`. (Home…

…brew#23328)
jedahan · Sep 24, 2016 · e32f6e8 · e32f6e8
1 parent d1fe302
commit e32f6e8
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/lib/hbc/installer.rb b/lib/hbc/installer.rb
@@ -318,7 +318,7 @@ def purge_versioned_files
     odebug "Purging files for version #{@cask.version} of Cask #{@cask}"
 
     # versioned staged distribution
-    gain_permissions_remove(@cask.staged_path) if @cask.staged_path.exist?
+    gain_permissions_remove(@cask.staged_path) if !@cask.staged_path.nil? && @cask.staged_path.exist?
 
     # Homebrew-Cask metadata
     if @cask.metadata_versioned_container_path.respond_to?(:children) &&

diff --git a/lib/hbc/without_source.rb b/lib/hbc/without_source.rb
@@ -2,7 +2,7 @@ class Hbc::WithoutSource < Hbc::Cask
   # Override from `Hbc::DSL` because we don't have a cask source file to work
   # with, so we don't know the cask's `version`.
   def staged_path
-    caskroom_path.children.first
+    (caskroom_path.children - [metadata_master_container_path]).first
   end
 
   def to_s