From 1de27dbbbe6fa7f057b0c9f55a98ffb2c9754f02 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Wed, 3 Apr 2013 19:03:16 -0400
Subject: check for unused keys on an unwanted remote, and move them off,
 before deleting it

---
 Assistant/Threads/TransferScanner.hs | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to 'Assistant/Threads/TransferScanner.hs')

diff --git a/Assistant/Threads/TransferScanner.hs b/Assistant/Threads/TransferScanner.hs
index 01ea3c22b..46695469e 100644
--- a/Assistant/Threads/TransferScanner.hs
+++ b/Assistant/Threads/TransferScanner.hs
@@ -127,9 +127,8 @@ expensiveScan urlrenderer rs = unless onlyweb $ do
 
 	debug ["finished scan of", show visiblers]
 
-	nuke <- asIO1  $ finishRemovingRemote urlrenderer
-	liftIO $ forM_ (S.toList removablers) $
-		void . tryNonAsync . nuke
+	remove <- asIO1 $ removableRemote urlrenderer
+	liftIO $ mapM_ (void . tryNonAsync . remove) $ S.toList removablers
   where
 	onlyweb = all (== webUUID) $ map Remote.uuid rs
 	visiblers = let rs' = filter (not . Remote.readonly) rs
-- 
cgit v1.2.3