From d360ca3ed9ebfc4abc34694138ff5628838fed5f Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Tue, 5 Jul 2011 15:06:20 -0400 Subject: make upgrade more robust don't remove .git-annex until state has been succeffully saved --- Upgrade/V2.hs | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Upgrade/V2.hs') diff --git a/Upgrade/V2.hs b/Upgrade/V2.hs index 14e328edb..4824f4bba 100644 --- a/Upgrade/V2.hs +++ b/Upgrade/V2.hs @@ -54,11 +54,13 @@ upgrade = do when e $ do mapM_ (\(k, f) -> inject f $ logFile k) =<< locationLogs g mapM_ (\f -> inject f f) =<< logFiles (olddir g) - liftIO $ do - Git.run g "rm" [Param "-r", Param "-f", Param "-q", File (olddir g)] - unless bare $ gitAttributesUnWrite g saveState + + when e $ liftIO $ do + Git.run g "rm" [Param "-r", Param "-f", Param "-q", File (olddir g)] + unless bare $ gitAttributesUnWrite g + unless bare $ push return True -- cgit v1.2.3