drop --from: When local repository is untrusted, its copy of a file does not count.

Command/Drop.hs

@@ -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) $
+	trusteduuids' <- if present
-		if present then u:trusteduuids else trusteduuids
+		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)

debian/changelog

@@ -21,6 +21,8 @@ git-annex (5.20140413) UNRELEASED; urgency=medium
     the configuration of a previously known repository.
     Useful if a repository got deleted and you want
     to clone it back the way it was.
+  * drop --from: When local repository is untrusted, its copy of a file does
+    not count.
 
  -- Joey Hess <joeyh@debian.org>  Fri, 11 Apr 2014 21:33:35 -0400
 

doc/bugs/Drop_--from_always_trusts_local_repository.mdwn

@@ -42,3 +42,5 @@ index 269c4c2..09ea99a 100644
         let tocheck = filter (/= remote) $
                 Remote.remotesWithoutUUID remotes (have++untrusteduuids)
 """]]
+
+> [[fixed|done]] --[[Joey]]