From d5f672ddd59b43cb9b1bac8f836864165c8931f2 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 23 May 2016 17:03:20 -0400 Subject: Pass the various gnupg-options configs to gpg in several cases where they were not before. Removed the instance LensGpgEncParams RemoteConfig because it encouraged code that does not take the RemoteGitConfig into account. RemoteType's setup was changed to take a RemoteGitConfig, although the only place that is able to provide a non-empty one is enableremote, when it's changing an existing remote. This led to several folow-on changes, and got RemoteGitConfig plumbed through. --- Remote.hs | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'Remote.hs') diff --git a/Remote.hs b/Remote.hs index 0dd8b0ace..79059df99 100644 --- a/Remote.hs +++ b/Remote.hs @@ -31,6 +31,7 @@ module Remote ( byNameOrGroup, byNameOnly, byNameWithUUID, + byUUID, byCost, prettyPrintUUIDs, prettyPrintUUIDsDescs, @@ -98,6 +99,11 @@ addName desc n | desc == n || null desc = "[" ++ n ++ "]" | otherwise = desc ++ " [" ++ n ++ "]" +byUUID :: UUID -> Annex (Maybe Remote) +byUUID u = headMaybe . filter matching <$> remoteList + where + matching r = uuid r == u + {- When a name is specified, looks up the remote matching that name. - (Or it can be a UUID.) - -- cgit v1.2.3