diff options
| author |  Joey Hess <joey@kitenet.net> | 2013-02-14 14:10:36 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2013-02-14 14:15:26 -0400 |
| commit | 177245deb6ee3271eb44d77c2b0cd722755b2c3f (patch) | |
| tree | 876c4844937c831470192d367123f581fb6cc3d8 /Types | |
| parent | 4e2d50d2e4c9b4d3487c24042b733d02c2f4dd46 (diff) | |
crippled filesystem support, probing and initial support
git annex init probes for crippled filesystems, and sets direct mode, as
well as `annex.crippledfilesystem`.
Avoid manipulating permissions of files on crippled filesystems.
That would likely cause an exception to be thrown.
Very basic support in Command.Add for cripped filesystems; avoids the lock
down entirely since doing it needs both permissions and hard links.
Will make this better soon.
Diffstat (limited to 'Types')
| -rw-r--r-- | Types/GitConfig.hs | 2 | ||||
| -rw-r--r-- | Types/KeySource.hs | 7 |
2 files changed, 7 insertions, 2 deletions
diff --git a/Types/GitConfig.hs b/Types/GitConfig.hs index 86bfd39b6..014a409e1 100644 --- a/Types/GitConfig.hs +++ b/Types/GitConfig.hs @@ -35,6 +35,7 @@ data GitConfig = GitConfig , annexHttpHeadersCommand :: Maybe String , annexAutoCommit :: Bool , annexWebOptions :: [String] + , annexCrippledFileSystem :: Bool } extractGitConfig :: Git.Repo -> GitConfig @@ -55,6 +56,7 @@ extractGitConfig r = GitConfig , annexHttpHeadersCommand = getmaybe "http-headers-command" , annexAutoCommit = getbool "autocommit" True , annexWebOptions = getwords "web-options" + , annexCrippledFileSystem = getbool "crippledfilesystem" False } where get k def = fromMaybe def $ getmayberead k diff --git a/Types/KeySource.hs b/Types/KeySource.hs index f4885767a..628954c33 100644 --- a/Types/KeySource.hs +++ b/Types/KeySource.hs @@ -12,9 +12,12 @@ module Types.KeySource where - - The contentLocation may be different from the filename - associated with the key. For example, the add command - - temporarily puts the content into a lockdown directory + - may temporarily hard link the content into a lockdown directory - for checking. The migrate command uses the content - - of a different Key. -} + - of a different Key. + - + - + -} data KeySource = KeySource { keyFilename :: FilePath , contentLocation :: FilePath |