From 05c37ced983e89505c2c3cdcbe1db67e3a86560b Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 14 Oct 2014 14:38:38 -0400
Subject: 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.
---
 Command/Map.hs   | 4 ++--
 Command/Trust.hs | 4 ++--
 Utility/Yesod.hs | 4 ----
 3 files changed, 4 insertions(+), 8 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
diff --git a/Utility/Yesod.hs b/Utility/Yesod.hs
index afe10a111..6d38ba4ed 100644
--- a/Utility/Yesod.hs
+++ b/Utility/Yesod.hs
@@ -28,11 +28,7 @@ import Yesod as Y
 #else
 import Yesod as Y hiding (Html)
 #endif
-#if MIN_VERSION_yesod_form(1,3,8)
-import Yesod.Form.Bootstrap3 as Y hiding (bfs)
-#else
 import Assistant.WebApp.Bootstrap3 as Y hiding (bfs)
-#endif
 #ifndef __NO_TH__
 import Yesod.Default.Util
 import Language.Haskell.TH.Syntax (Q, Exp)
-- 
cgit v1.2.3