From 425bc1107aebdb701cdcee44da731dd918cd470d Mon Sep 17 00:00:00 2001
From: Joey Hess <joeyh@joeyh.name>
Date: Fri, 9 Jan 2015 13:11:56 -0400
Subject: revert parentDir change

Reverts 2bba5bc22d049272d3328bfa6c452d3e2e50e86c

Unfortunately, this caused breakage on Windows, and possibly elsewhere,
because parentDir and takeDirectory do not behave the same when there is a
trailing directory separator.
---
 Assistant/Threads/UpgradeWatcher.hs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Assistant/Threads')

diff --git a/Assistant/Threads/UpgradeWatcher.hs b/Assistant/Threads/UpgradeWatcher.hs
index 401215999..431e6f339 100644
--- a/Assistant/Threads/UpgradeWatcher.hs
+++ b/Assistant/Threads/UpgradeWatcher.hs
@@ -47,7 +47,7 @@ upgradeWatcherThread urlrenderer = namedThread "UpgradeWatcher" $ do
 			, modifyHook = changed
 			, delDirHook = changed
 			}
-		let dir = takeDirectory flagfile
+		let dir = parentDir flagfile
 		let depth = length (splitPath dir) + 1
 		let nosubdirs f = length (splitPath f) == depth
 		void $ liftIO $ watchDir dir nosubdirs False hooks (startup mvar)
-- 
cgit v1.2.3