From 0210628263f5a9da4f7ceb6b359108174ac01182 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Mon, 13 Dec 2010 11:35:00 -0400
Subject: Fix upgrade from 0.03.

---
 Upgrade.hs | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

(limited to 'Upgrade.hs')

diff --git a/Upgrade.hs b/Upgrade.hs
index d64d5287d..52ecfa07d 100644
--- a/Upgrade.hs
+++ b/Upgrade.hs
@@ -7,9 +7,12 @@
 
 module Upgrade where
 
+import System.IO.Error (try)
 import System.Directory
 import Control.Monad.State (liftIO)
+import Control.Monad (filterM)
 import System.Posix.Files
+import System.FilePath
 
 import Core
 import Types
@@ -37,7 +40,7 @@ upgradeFrom0 = do
 
 	-- do the reorganisation of the files
 	let olddir = annexDir g
-	keys <- getKeysPresent' olddir
+	keys <- getKeysPresent0' olddir
 	_ <- mapM (\k -> moveAnnex k $ olddir ++ "/" ++ keyFile k) keys
 
 	-- update the symlinks to the files
@@ -61,3 +64,16 @@ upgradeFrom0 = do
 					liftIO $ createSymbolicLink link f
 					Annex.queue "add" ["--"] f
 			fixlinks fs
+
+getKeysPresent0' :: FilePath -> Annex [Key]
+getKeysPresent0' dir = do
+	contents <- liftIO $ getDirectoryContents dir
+	files <- liftIO $ filterM present contents
+	return $ map fileKey files
+	where
+		present d = do
+			result <- try $
+				getFileStatus $ dir ++ "/" ++ takeFileName d
+			case result of
+				Right s -> return $ isRegularFile s
+				Left _ -> return False
-- 
cgit v1.2.3