diff options
author | Joey Hess <joey@kitenet.net> | 2014-10-14 14:38:38 -0400 |
---|---|---|
committer | Joey Hess <joey@kitenet.net> | 2014-10-14 14:38:38 -0400 |
commit | 05c37ced983e89505c2c3cdcbe1db67e3a86560b (patch) | |
tree | 8f3d9158c3eb9107b90c1f5ed1aecaf55251b6f8 /Command | |
parent | 5bc67b69695d2056f7a2e88b5932babdb0f8f9fd (diff) |
unbreak android build
This reverts commit cfc51c5e4ec04f9d5088c42922217cf90b63c903
and commit 78f94f50674d60c7d54307029bef1edf9b27782b.
Those commits were fine, except the android autobuilder currently has a bit
of a mess of yesod versions and broke. Better to wait on this.
Diffstat (limited to 'Command')
-rw-r--r-- | Command/Map.hs | 4 | ||||
-rw-r--r-- | Command/Trust.hs | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/Command/Map.hs b/Command/Map.hs index 940a0796f..702cde6e9 100644 --- a/Command/Map.hs +++ b/Command/Map.hs @@ -194,11 +194,11 @@ tryScan r | Git.repoIsUrl r = return Nothing | otherwise = liftIO $ safely $ Git.Config.read r where - pipedconfig cmd params = liftIO $ safely $ + pipedconfig c params = liftIO $ safely $ withHandle StdoutHandle createProcessSuccess p $ Git.Config.hRead r where - p = proc cmd $ toCommand params + p = proc c $ toCommand params configlist = Ssh.onRemote r (pipedconfig, return Nothing) "configlist" [] [] manualconfiglist = do diff --git a/Command/Trust.hs b/Command/Trust.hs index 638fc50e4..5c66c4e98 100644 --- a/Command/Trust.hs +++ b/Command/Trust.hs @@ -24,11 +24,11 @@ seek :: CommandSeek seek = trustCommand "trust" Trusted trustCommand :: String -> TrustLevel -> CommandSeek -trustCommand cmd level = withWords start +trustCommand cmdname level = withWords start where start ws = do let name = unwords ws - showStart cmd name + showStart cmdname name u <- Remote.nameToUUID name next $ perform u perform uuid = do |