e213ef310f
* Fix minor FD leak in journal code. Closes: #754608 * direct: Fix handling of case where a work tree subdirectory cannot be written to due to permissions. * migrate: Avoid re-checksumming when migrating from hashE to hash backend. * uninit: Avoid failing final removal in some direct mode repositories due to file modes. * S3: Deal with AWS ACL configurations that do not allow creating or checking the location of a bucket, but only reading and writing content to it. * resolvemerge: New plumbing command that runs the automatic merge conflict resolver. * Deal with change in git 2.0 that made indirect mode merge conflict resolution leave behind old files. * sync: Fix git sync with local git remotes even when they don't have an annex.uuid set. (The assistant already did so.) * Set gcrypt-publish-participants when setting up a gcrypt repository, to avoid unncessary passphrase prompts. This is a security/usability tradeoff. To avoid exposing the gpg key ids who can decrypt the repository, users can unset gcrypt-publish-participants. * Install nautilus hooks even when ~/.local/share/nautilus/ does not yet exist, since it is not automatically created for Gnome 3 users. * Windows: Move .vbs files out of git\bin, to avoid that being in the PATH, which caused some weird breakage. (Thanks, divB) * Windows: Fix locking issue that prevented the webapp starting (since 5.20140707). # imported from the archive
29 lines
859 B
Haskell
29 lines
859 B
Haskell
{- KeySource data type
|
|
-
|
|
- Copyright 2012 Joey Hess <joey@kitenet.net>
|
|
-
|
|
- Licensed under the GNU GPL version 3 or higher.
|
|
-}
|
|
|
|
module Types.KeySource where
|
|
|
|
import Utility.InodeCache
|
|
|
|
{- When content is in the process of being added to the annex,
|
|
- and a Key generated from it, this data type is used.
|
|
-
|
|
- The contentLocation may be different from the filename
|
|
- associated with the key. For example, the add command
|
|
- may temporarily hard link the content into a lockdown directory
|
|
- for checking. The migrate command uses the content
|
|
- of a different Key.
|
|
-
|
|
- The inodeCache can be used to detect some types of modifications to
|
|
- files that may be made while they're in the process of being added.
|
|
-}
|
|
data KeySource = KeySource
|
|
{ keyFilename :: FilePath
|
|
, contentLocation :: FilePath
|
|
, inodeCache :: Maybe InodeCache
|
|
}
|
|
deriving (Show)
|