diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-04-03 19:03:16 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-04-03 19:03:16 -0400 |
| commit | 1de27dbbbe6fa7f057b0c9f55a98ffb2c9754f02 (patch) | |
| tree | 1a7a69e36ba10b559a1ac03491fc3db5f99c7efd /Assistant/Threads/TransferScanner.hs | |
| parent | 72b25b61e9c91668e0c05a17c50462b822885eb8 (diff) | |
check for unused keys on an unwanted remote, and move them off, before deleting it
Diffstat (limited to 'Assistant/Threads/TransferScanner.hs')
| -rw-r--r-- | Assistant/Threads/TransferScanner.hs | 5 |
1 files changed, 2 insertions, 3 deletions
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 |