mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

fix

Browse source
This commit is contained in:
Joey Hess 2013-12-09 17:11:40 -04:00
parent a268ac6c1d
commit 86a4b56db3
1 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Assistant/WebApp/Configurators/Local.hs
View file

@ -351,15 +351,12 @@ driveList :: IO [RemovableDrive]
#ifdef mingw32_HOST_OS #ifdef mingw32_HOST_OS
-- Just enumerate all likely drive letters for Windows. -- Just enumerate all likely drive letters for Windows.
-- Could use wmic, but it only works for administrators. -- Could use wmic, but it only works for administrators.
driveList = return $ map (:":") ['A'..'Z'] driveList = return $ map (\l -> gen $ l:":") ['A'..'Z']
where
#else #else
#ifdef WITH_CLIBS #ifdef WITH_CLIBS
driveList = mapM (gen . mnt_dir) =<< filter sane <$> getMounts driveList = mapM (gen . mnt_dir) =<< filter sane <$> getMounts
where where
gen dir = RemovableDrive
<$> getDiskFree dir
<*> pure (T.pack dir)
<*> pure (T.pack gitAnnexAssistantDefaultDir)
-- filter out some things that are surely not removable drives -- filter out some things that are surely not removable drives
sane Mntent { mnt_dir = dir, mnt_fsname = dev } sane Mntent { mnt_dir = dir, mnt_fsname = dev }
{- We want real disks like /dev/foo, not {- We want real disks like /dev/foo, not
@ -379,8 +376,13 @@ driveList = mapM (gen . mnt_dir) =<< filter sane <$> getMounts
| otherwise = True | otherwise = True
#else #else
driveList = return [] driveList = return []
where
#endif #endif
#endif #endif
gen dir = RemovableDrive
<$> getDiskFree dir
<*> pure (T.pack dir)
<*> pure (T.pack gitAnnexAssistantDefaultDir)
{- Bootstraps from first run mode to a fully running assistant in a {- Bootstraps from first run mode to a fully running assistant in a
- repository, by running the postFirstRun callback, which returns the - repository, by running the postFirstRun callback, which returns the