[jackhill/guix/guix.git] / gnu / packages / patches / ganeti-preserve-PYTHONPATH.patch

Do not override PYTHONPATH when calling Python code from the Haskell
daemons.  This is necessary because the Python library dependencies are
only available through PYTHONPATH.

diff --git a/src/Ganeti/Query/Exec.hs b/src/Ganeti/Query/Exec.hs
--- a/src/Ganeti/Query/Exec.hs
+++ b/src/Ganeti/Query/Exec.hs
@@ -99,12 +99,10 @@ spawnJobProcess jid = withErrorLogAt CRITICAL (show jid) $
   do
     use_debug <- isDebugMode
     env_ <- (M.toList . M.insert "GNT_DEBUG" (if use_debug then "1" else "0")
-            . M.insert "PYTHONPATH" AC.pythondir
             . M.fromList)
            `liftM` getEnvironment
     execPy <- P.jqueueExecutorPy
     logDebug $ "Executing " ++ AC.pythonPath ++ " " ++ execPy
-               ++ " with PYTHONPATH=" ++ AC.pythondir
 
     (master, child) <- pipeClient connectConfig
     let (rh, wh) = clientToHandle child
Commit	Line	Data
72a91d74 MB	1	Do not override PYTHONPATH when calling Python code from the Haskell
	2	daemons. This is necessary because the Python library dependencies are
	3	only available through PYTHONPATH.
	4
	5	diff --git a/src/Ganeti/Query/Exec.hs b/src/Ganeti/Query/Exec.hs
	6	--- a/src/Ganeti/Query/Exec.hs
	7	+++ b/src/Ganeti/Query/Exec.hs
	8	@@ -99,12 +99,10 @@ spawnJobProcess jid = withErrorLogAt CRITICAL (show jid) $
	9	do
	10	use_debug <- isDebugMode
	11	env_ <- (M.toList . M.insert "GNT_DEBUG" (if use_debug then "1" else "0")
	12	- . M.insert "PYTHONPATH" AC.pythondir
	13	. M.fromList)
	14	`liftM` getEnvironment
	15	execPy <- P.jqueueExecutorPy
	16	logDebug $ "Executing " ++ AC.pythonPath ++ " " ++ execPy
	17	- ++ " with PYTHONPATH=" ++ AC.pythondir
	18
	19	(master, child) <- pipeClient connectConfig
	20	let (rh, wh) = clientToHandle child
	21