From 04f27132314744ad743cda697761b510b1cb17e8 Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Tue, 27 Nov 2012 22:57:04 -0400
Subject: avoid using Data.AssocList, which is cunningly part of hxt

---
 Assistant/Install.hs                                         | 12 ++++++------
 ...uld_not_find_module___96__Data.AssocList__39____34__.mdwn |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/Assistant/Install.hs b/Assistant/Install.hs
index 475161c63..97f2dee94 100644
--- a/Assistant/Install.hs
+++ b/Assistant/Install.hs
@@ -21,7 +21,6 @@ import Utility.OSX
 import Utility.FreeDesktop
 #endif
 
-import Data.AssocList
 import System.Posix.Env
 
 standaloneAppBase :: IO (Maybe FilePath)
@@ -84,9 +83,10 @@ cleanEnvironment = clean <$> getEnvironment
 		| otherwise = Just $ catMaybes $ map (restoreorig env) env
 		| otherwise = Nothing
 	  where
-		vars = words $ lookup1 "GIT_ANNEX_STANDLONE_ENV" env
-		restoreorig oldenv p@(k, v)
-			| k `elem` vars = case lookup1 ("ORIG_" ++ k) oldenv of
-				"" -> Nothing
-				v' -> Just (k, v')
+		vars = words $ fromMaybe "" $
+			lookup "GIT_ANNEX_STANDLONE_ENV" env
+		restoreorig oldenv p@(k, _v)
+			| k `elem` vars = case lookup ("ORIG_" ++ k) oldenv of
+				Nothing -> Nothing
+				(Just v') -> Just (k, v')
 			| otherwise = Just p
diff --git a/doc/bugs/cabal_build:___34__Could_not_find_module___96__Data.AssocList__39____34__.mdwn b/doc/bugs/cabal_build:___34__Could_not_find_module___96__Data.AssocList__39____34__.mdwn
index 22f1aa807..a23930bd7 100644
--- a/doc/bugs/cabal_build:___34__Could_not_find_module___96__Data.AssocList__39____34__.mdwn
+++ b/doc/bugs/cabal_build:___34__Could_not_find_module___96__Data.AssocList__39____34__.mdwn
@@ -20,4 +20,4 @@ building using cabal from clone of git clone git://git-annex.branchable.com/, co
 
 Please provide any additional information below.
 
-
+> [[done]], using Data.List instead now.
-- 
cgit v1.2.3