remove unnecessary qualification

This commit is contained in:
Joey Hess 2015-01-16 13:14:44 -04:00
parent ab67086da5
commit 3abb775855

View file

@ -131,8 +131,8 @@ byNameOrGroup :: RemoteName -> Annex [Remote]
byNameOrGroup n = go =<< getConfigMaybe (ConfigKey ("remotes." ++ n)) byNameOrGroup n = go =<< getConfigMaybe (ConfigKey ("remotes." ++ n))
where where
go (Just l) = concatMap maybeToList <$> go (Just l) = concatMap maybeToList <$>
mapM (Remote.byName . Just) (split " " l) mapM (byName . Just) (split " " l)
go Nothing = maybeToList <$> Remote.byName (Just n) go Nothing = maybeToList <$> byName (Just n)
{- Only matches remote name, not UUID -} {- Only matches remote name, not UUID -}
byNameOnly :: RemoteName -> Annex (Maybe Remote) byNameOnly :: RemoteName -> Annex (Maybe Remote)
@ -279,8 +279,8 @@ showLocations key exclude nolocmsg = do
untrusteduuids <- trustGet UnTrusted untrusteduuids <- trustGet UnTrusted
let uuidswanted = filteruuids uuids (u:exclude++untrusteduuids) let uuidswanted = filteruuids uuids (u:exclude++untrusteduuids)
let uuidsskipped = filteruuids uuids (u:exclude++uuidswanted) let uuidsskipped = filteruuids uuids (u:exclude++uuidswanted)
ppuuidswanted <- Remote.prettyPrintUUIDs "wanted" uuidswanted ppuuidswanted <- prettyPrintUUIDs "wanted" uuidswanted
ppuuidsskipped <- Remote.prettyPrintUUIDs "skipped" uuidsskipped ppuuidsskipped <- prettyPrintUUIDs "skipped" uuidsskipped
showLongNote $ message ppuuidswanted ppuuidsskipped showLongNote $ message ppuuidswanted ppuuidsskipped
ignored <- filter (remoteAnnexIgnore . gitconfig) <$> remoteList ignored <- filter (remoteAnnexIgnore . gitconfig) <$> remoteList
unless (null ignored) $ unless (null ignored) $