From 303666965ab5bc891c8ed44969553afb642c3f9c Mon Sep 17 00:00:00 2001
From: Joey Hess <joey@kitenet.net>
Date: Sat, 28 Jan 2012 15:23:28 -0400
Subject: Revert "Avoid creating ~/.bup when initializing a bup remote"

This reverts commit 6da40100c99a097401fb130b63edc05b18f61249.

On closer examinaton, this change is wrong. The bup special remote
can be configured with "buprepo=", which makes it use the default
~/.bup repo. This change makes it use a different temp dir each time,
which I'm sure would not be appreciated by anyone with that
configuration.

Bup insisting in creating ~/.bup even when using a different repo
does seem like a bug in *something*, but I'm leaning toward the bug
being in bup itself.
---
 Remote/Bup.hs | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

(limited to 'Remote')

diff --git a/Remote/Bup.hs b/Remote/Bup.hs
index 583358f24..9b54d8c85 100644
--- a/Remote/Bup.hs
+++ b/Remote/Bup.hs
@@ -11,8 +11,6 @@ import qualified Data.ByteString.Lazy.Char8 as L
 import System.IO.Error
 import qualified Data.Map as M
 import System.Process
-import System.Posix.Env (getEnvironment)
-import System.Path (brackettmpdir)
 
 import Common.Annex
 import Types.Remote
@@ -85,21 +83,10 @@ bupParams :: String -> BupRepo -> [CommandParam] -> [CommandParam]
 bupParams command buprepo params = 
 	Param command : [Param "-r", Param buprepo] ++ params
 
-isLocal :: BupRepo -> Bool
-isLocal buprepo = not (elem ':' buprepo)
-
 bup :: String -> BupRepo -> [CommandParam] -> Annex Bool
 bup command buprepo params = do
 	showOutput -- make way for bup output
-	liftIO action
-	where
-		action | isLocal buprepo = runBup lparams buprepo
-		       | otherwise = brackettmpdir "bupXXXXXX" $ runBup rparams
-		lparams = Param command : params
-		rparams = bupParams command buprepo params
-		runBup params bupdir = do
-			env <- getEnvironment
-			boolSystemEnv "bup" params (Just (("BUP_DIR", bupdir) : env))
+	liftIO $ boolSystem "bup" $ bupParams command buprepo params
 
 pipeBup :: [CommandParam] -> Maybe Handle -> Maybe Handle -> IO Bool
 pipeBup params inh outh = do
-- 
cgit v1.2.3