From 98f147dbda124ab3a9412542de106d8f7f31a6a5 Mon Sep 17 00:00:00 2001 From: Maxim Cournoyer Date: Wed, 27 Jan 2021 23:41:51 -0500 Subject: gnu: ganeti: Remove PYTHONPATH-altering patch. * gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch: Delete file. * gnu/local.mk (dist_patch_DATA): Un-register it. * gnu/packages/virtualization.scm (ganeti): Remove patch. --- .../patches/ganeti-preserve-PYTHONPATH.patch | 21 --------------------- gnu/packages/virtualization.scm | 3 +-- 2 files changed, 1 insertion(+), 23 deletions(-) delete mode 100644 gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch (limited to 'gnu/packages') diff --git a/gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch b/gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch deleted file mode 100644 index 1358e30633..0000000000 --- a/gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch +++ /dev/null @@ -1,21 +0,0 @@ -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 - diff --git a/gnu/packages/virtualization.scm b/gnu/packages/virtualization.scm index 4470bedee7..f80aebd949 100644 --- a/gnu/packages/virtualization.scm +++ b/gnu/packages/virtualization.scm @@ -404,8 +404,7 @@ server and embedded PowerPC, and S390 guests.") "ganeti-drbd-compat.patch" "ganeti-os-disk-size.patch" "ganeti-haskell-pythondir.patch" - "ganeti-disable-version-symlinks.patch" - "ganeti-preserve-PYTHONPATH.patch")))) + "ganeti-disable-version-symlinks.patch")))) (build-system gnu-build-system) (arguments `(#:imported-modules (,@%gnu-build-system-modules -- cgit v1.2.3