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

getUserEntryForID does not work on windows

Browse source 
Throw an error instead, mentioning the relevant env vars.
This commit is contained in:
Joey Hess 2014-10-31 15:46:44 -04:00
parent 8f072c8db7
commit 86b326782a
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Utility/UserInfo.hs
View file

@ -48,8 +48,11 @@ myUserGecos = myVal [] userGecos
#endif #endif
myVal :: [String] -> (UserEntry -> String) -> IO String myVal :: [String] -> (UserEntry -> String) -> IO String
myVal envvars extract = maybe (extract <$> getpwent) return =<< check envvars myVal envvars extract = go envvars
where where
check [] = return Nothing #ifndef mingw32_HOST_OS
check (v:vs) = maybe (check vs) (return . Just) =<< getEnv v go [] = extract <$> (getUserEntryForID =<< getEffectiveUserID)
getpwent = getUserEntryForID =<< getEffectiveUserID #else
go [] = error $ "environment not set: " ++ show envvars
#endif
go (v:vs) = maybe (go vs) return =<< getEnv v

7
doc/bugs/annex_get_fails_from_read-only_filesystem/comment_6_c469f1fe8ae6981a038be7f8723a07b1._comment Normal file
View file

@ -0,0 +1,7 @@
[[!comment format=mdwn
username="joey"
subject="""comment 6"""
date="2014-10-31T16:55:47Z"
content="""
An upgrade could move the annexed objects around.
"""]]