From fd97e88b990b4804e9cfec90e3e5fe60fa54437a Mon Sep 17 00:00:00 2001
From: Markus Reiter
Date: Mon, 22 May 2017 04:15:11 +0200
Subject: Use `LockFile` instead of `Hbc::Utils::file_locked?`.

---
 Library/Homebrew/cask/lib/hbc/cli/cleanup.rb | 14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

(limited to 'Library/Homebrew/cask/lib/hbc/cli')

diff --git a/Library/Homebrew/cask/lib/hbc/cli/cleanup.rb b/Library/Homebrew/cask/lib/hbc/cli/cleanup.rb
index e25393230..40b37dd5d 100644
--- a/Library/Homebrew/cask/lib/hbc/cli/cleanup.rb
+++ b/Library/Homebrew/cask/lib/hbc/cli/cleanup.rb
@@ -75,14 +75,18 @@ module Hbc
         paths.each do |item|
           next unless item.exist?
           processed_files += 1
-          if Utils.file_locked?(item)
+
+          begin
+            LockFile.new(item.basename).with_lock do
+              puts item
+              item_size = File.size?(item)
+              cleanup_size += item_size unless item_size.nil?
+              item.unlink
+            end
+          rescue OperationInProgressError
             puts "skipping: #{item} is locked"
             next
           end
-          puts item
-          item_size = File.size?(item)
-          cleanup_size += item_size unless item_size.nil?
-          item.unlink
         end
 
         if processed_files.zero?
-- 
cgit v1.2.3