fix for Android

1 files changed, 12 insertions, 2 deletions

diff --git a/Assistant/XMPP/Git.hs b/Assistant/XMPP/Git.hs
index 6a50e13f6..f48178985 100644
--- a/Assistant/XMPP/Git.hs
+++ b/Assistant/XMPP/Git.hs
@@ -92,8 +92,7 @@ xmppPush cid gitpush handledeferred = runPush SendPack cid handledeferred $ do
 	(readpush, Fd outf) <- liftIO createPipe
 	(Fd controlf, writecontrol) <- liftIO createPipe
 
-	tmp <- liftAnnex $ fromRepo gitAnnexTmpDir
-	let tmpdir = tmp </> "xmppgit"
+	tmpdir <- gettmpdir
 	installwrapper tmpdir
 
 	env <- liftIO getEnvironment
@@ -160,6 +159,17 @@ xmppPush cid gitpush handledeferred = runPush SendPack cid handledeferred $ do
 			, "exec " ++ program ++ " xmppgit"
 			]
 		modifyFileMode wrapper $ addModes executeModes
+	{- Use GIT_ANNEX_TMP_DIR if set, since that may be a better temp
+	 - dir (ie, not on a crippled filesystem where we can't make
+	 - the wrapper executable). -}
+	gettmpdir = do
+		v <- liftIO $ getEnv "GIT_ANNEX_TMP_DIR"
+		case v of
+			Nothing -> do
+				tmp <- liftAnnex $ fromRepo gitAnnexTmpDir
+				return $ tmp </> "xmppgit"
+			Just d -> return $ d </> "xmppgit"
+				
 
 type EnvVar = String