diff options
author | 2014-10-15 11:49:13 -0400 | |
---|---|---|
committer | 2014-10-15 11:49:13 -0400 | |
commit | 9f1b4c2f61a1173be9943a3e301b0e2dac789739 (patch) | |
tree | f6872483dc6aac00614e3a35ee7228371083a82e /Command | |
parent | 47061d00fdb2ebc51b9ca9cc99f006eb32212233 (diff) |
revert reversion
This reverts commit 05c37ced983e89505c2c3cdcbe1db67e3a86560b.
Android build is going to have consistent versions again.
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 702cde6e9..940a0796f 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 c params = liftIO $ safely $ + pipedconfig cmd params = liftIO $ safely $ withHandle StdoutHandle createProcessSuccess p $ Git.Config.hRead r where - p = proc c $ toCommand params + p = proc cmd $ toCommand params configlist = Ssh.onRemote r (pipedconfig, return Nothing) "configlist" [] [] manualconfiglist = do diff --git a/Command/Trust.hs b/Command/Trust.hs index 5c66c4e98..638fc50e4 100644 --- a/Command/Trust.hs +++ b/Command/Trust.hs @@ -24,11 +24,11 @@ seek :: CommandSeek seek = trustCommand "trust" Trusted trustCommand :: String -> TrustLevel -> CommandSeek -trustCommand cmdname level = withWords start +trustCommand cmd level = withWords start where start ws = do let name = unwords ws - showStart cmdname name + showStart cmd name u <- Remote.nameToUUID name next $ perform u perform uuid = do |