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

Fix reversion in init when ran as root, introduced in version 5.20150731.

Browse source
This commit is contained in:
Joey Hess 2015-08-19 12:36:17 -04:00
parent 1e3d7ad4e0
commit c242e248e8
4 changed files with 17 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Annex/Init.hs
View file

@ -40,6 +40,7 @@ import Upgrade
import Utility.UserInfo import Utility.UserInfo
import Utility.FileMode import Utility.FileMode
import Annex.Perms import Annex.Perms
import System.Posix.User
#endif #endif
genDescription :: Maybe String -> Annex String genDescription :: Maybe String -> Annex String
@ -141,8 +142,10 @@ probeCrippledFileSystem = do
-- Should be unable to write to the file, unless -- Should be unable to write to the file, unless
-- running as root, but some crippled -- running as root, but some crippled
-- filesystems ignore write bit removals. -- filesystems ignore write bit removals.
unlessM ifM ((== 0) <$> getRealUserID)
not <$> catchBoolIO (writeFile f "2" >> return True) ( return True
, not <$> catchBoolIO (writeFile f "2" >> return True)
)
#endif #endif
checkCrippledFileSystem :: Annex () checkCrippledFileSystem :: Annex ()

1
debian/changelog vendored
View file

@ -14,6 +14,7 @@ git-annex (5.20150813) UNRELEASED; urgency=medium
* Avoid building the assistant on the hurd, since an inotify equivilant * Avoid building the assistant on the hurd, since an inotify equivilant
is not yet implemented in git-annex for the hurd. is not yet implemented in git-annex for the hurd.
* importfeed --relaxed: Avoid hitting the urls of items in the feed. * importfeed --relaxed: Avoid hitting the urls of items in the feed.
* Fix reversion in init when ran as root, introduced in version 5.20150731.
-- Joey Hess <id@joeyh.name> Wed, 12 Aug 2015 14:31:01 -0400 -- Joey Hess <id@joeyh.name> Wed, 12 Aug 2015 14:31:01 -0400

2
doc/bugs/decides_that_FS_is_crippled_under_cowbuilder___40__symlinks_supported_etc__41__.mdwn
View file

@ -41,3 +41,5 @@ Debian sid 5.20150812-2
# End of transcript or log. # End of transcript or log.
"""]] """]]
> [[fixed|done]] --[[Joey]]

9
doc/bugs/decides_that_FS_is_crippled_under_cowbuilder___40__symlinks_supported_etc__41__/comment_1_82480202831a08388f9f716abfaa0340._comment Normal file
View file

@ -0,0 +1,9 @@
[[!comment format=mdwn
username="joey"
subject="""comment 1"""
date="2015-08-19T16:22:31Z"
content="""
Actually, it does detect a crippled FS when run as root here. I guess you
had some version confusion going on, since this problem was introduced in a
recent release. Fixing..
"""]]