more RawFilePath conversion

at 377/645

This commit was sponsored by Svenne Krap on Patreon.

Database/ContentIdentifier.hs

@@ -74,7 +74,7 @@ AnnexBranch
  -}
 openDb :: Annex ContentIdentifierHandle
 openDb = do
-	dbdir <- fromRepo gitAnnexContentIdentifierDbDir
+	dbdir <- fromRawFilePath <$> fromRepo gitAnnexContentIdentifierDbDir
 	let db = dbdir </> "db"
 	unlessM (liftIO $ doesFileExist db) $ do
 		initDb db $ void $

Database/Export.hs

@@ -96,7 +96,7 @@ ExportTreeCurrent
  -}
 openDb :: UUID -> Annex ExportHandle
 openDb u = do
-	dbdir <- fromRepo (gitAnnexExportDbDir u)
+	dbdir <- fromRawFilePath <$> fromRepo (gitAnnexExportDbDir u)
 	let db = dbdir </> "db"
 	unlessM (liftIO $ doesFileExist db) $ do
 		initDb db $ void $

Database/Keys.hs

@@ -114,7 +114,7 @@ openDb _ st@(DbOpen _) = return st
 openDb False DbUnavailable = return DbUnavailable
 openDb createdb _ = catchPermissionDenied permerr $ withExclusiveLock gitAnnexKeysDbLock $ do
 	dbdir <- fromRepo gitAnnexKeysDb
-	let db = dbdir </> "db"
+	let db = fromRawFilePath dbdir </> "db"
 	dbexists <- liftIO $ doesFileExist db
 	case (dbexists, createdb) of
 		(True, _) -> open db
@@ -214,7 +214,7 @@ isInodeKnown i s = or <$> runReaderIO ((:[]) <$$> SQL.isInodeKnown i s)
 reconcileStaged :: H.DbQueue -> Annex ()
 reconcileStaged qh = do
 	gitindex <- inRepo currentIndexFile
-	indexcache <- fromRepo gitAnnexKeysDbIndexCache
+	indexcache <- fromRawFilePath <$> fromRepo gitAnnexKeysDbIndexCache
 	withTSDelta (liftIO . genInodeCache (toRawFilePath gitindex)) >>= \case
 		Just cur -> 
 			liftIO (maybe Nothing readInodeCache <$> catchMaybeIO (readFile indexcache)) >>= \case