diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2016-11-17 12:56:27 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-11-17 12:56:27 -0400 |
| commit | 3a6c9ad7d00c6795faefcacbc42dc57d26aecd61 (patch) | |
| tree | a03564275f6a9532fe487353c04b1c0cf7659a0d /Remote.hs | |
| parent | a5584e1a61861dff0835f7ea4e366e393c0fd294 (diff) | |
| parent | 2286c5acb4b3917a71067264cc1075638848d340 (diff) | |
Merge branch 'master' into tor
Diffstat (limited to 'Remote.hs')
| -rw-r--r-- | Remote.hs | 6 |
1 files changed, 3 insertions, 3 deletions
@@ -112,7 +112,7 @@ byUUID u = headMaybe . filter matching <$> remoteList -} byName :: Maybe RemoteName -> Annex (Maybe Remote) byName Nothing = return Nothing -byName (Just n) = either error Just <$> byName' n +byName (Just n) = either giveup Just <$> byName' n {- Like byName, but the remote must have a configured UUID. -} byNameWithUUID :: Maybe RemoteName -> Annex (Maybe Remote) @@ -120,7 +120,7 @@ byNameWithUUID = checkuuid <=< byName where checkuuid Nothing = return Nothing checkuuid (Just r) - | uuid r == NoUUID = error $ + | uuid r == NoUUID = giveup $ if remoteAnnexIgnore (gitconfig r) then noRemoteUUIDMsg r ++ " (" ++ show (remoteConfig (repo r) "ignore") ++ @@ -156,7 +156,7 @@ noRemoteUUIDMsg r = "cannot determine uuid for " ++ name r ++ " (perhaps you nee - and returns its UUID. Finds even repositories that are not - configured in .git/config. -} nameToUUID :: RemoteName -> Annex UUID -nameToUUID = either error return <=< nameToUUID' +nameToUUID = either giveup return <=< nameToUUID' nameToUUID' :: RemoteName -> Annex (Either String UUID) nameToUUID' "." = Right <$> getUUID -- special case for current repo |