From aecd342a2bb699bf957a5b803bbc75b3edbd2f27 Mon Sep 17 00:00:00 2001 From: Adam Vandenberg Date: Sun, 11 Nov 2012 11:39:09 -0800 Subject: [PATCH] Try to remove a single .DS_Store when uninstalling Closes Homebrew/homebrew#12976. Closes Homebrew/homebrew#15975. --- Library/Homebrew/extend/pathname.rb | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Library/Homebrew/extend/pathname.rb b/Library/Homebrew/extend/pathname.rb index 0c55e6a6f0..d39b21689e 100644 --- a/Library/Homebrew/extend/pathname.rb +++ b/Library/Homebrew/extend/pathname.rb @@ -145,6 +145,12 @@ class Pathname rmdir true rescue SystemCallError => e + # OK, maybe there was only a single `.DS_Store` file in that folder + if (self/'.DS_Store').exist? && self.children.length == 1 + (self/'.DS_Store').unlink + retry + end + raise unless e.errno == Errno::ENOTEMPTY::Errno or e.errno == Errno::EACCES::Errno or e.errno == Errno::ENOENT::Errno false end