drop --from: When local repository is untrusted, its copy of a file does not count.
This commit is contained in:
parent
7f2ef57601
commit
584ab89ea2
3 changed files with 13 additions and 3 deletions
|
@ -78,12 +78,18 @@ performRemote :: Key -> AssociatedFile -> NumCopies -> Remote -> CommandPerform
|
|||
performRemote key afile numcopies remote = lockContent key $ do
|
||||
-- Filter the remote it's being dropped from out of the lists of
|
||||
-- places assumed to have the key, and places to check.
|
||||
-- When the local repo has the key, that's one additional copy.
|
||||
-- When the local repo has the key, that's one additional copy,
|
||||
-- as long asthe local repo is not untrusted.
|
||||
(remotes, trusteduuids) <- Remote.keyPossibilitiesTrusted key
|
||||
present <- inAnnex key
|
||||
u <- getUUID
|
||||
let have = filter (/= uuid) $
|
||||
if present then u:trusteduuids else trusteduuids
|
||||
trusteduuids' <- if present
|
||||
then ifM ((<= SemiTrusted) <$> lookupTrust u)
|
||||
( pure (u:trusteduuids)
|
||||
, pure trusteduuids
|
||||
)
|
||||
else pure trusteduuids
|
||||
let have = filter (/= uuid) trusteduuids'
|
||||
untrusteduuids <- trustGet UnTrusted
|
||||
let tocheck = filter (/= remote) $
|
||||
Remote.remotesWithoutUUID remotes (have++untrusteduuids)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue