125/131: gnu: ganeti: Remove PYTHONPATH-altering patch.

[guix-commits]

apteryx pushed a commit to branch core-updates
in repository guix.

commit 98f147dbda124ab3a9412542de106d8f7f31a6a5
Author: Maxim Cournoyer <maxim.cournoyer@gmail.com>
AuthorDate: Wed Jan 27 23:41:51 2021 -0500

    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.
---
 gnu/local.mk                                        |  1 -
 .../patches/ganeti-preserve-PYTHONPATH.patch        | 21 ---------------------
 gnu/packages/virtualization.scm                     |  3 +--
 3 files changed, 1 insertion(+), 24 deletions(-)

diff --git a/gnu/local.mk b/gnu/local.mk
index a0e9ebd..cbb8abd 100644
--- a/gnu/local.mk
+++ b/gnu/local.mk
@@ -1008,7 +1008,6 @@ dist_patch_DATA =                                         
\
   %D%/packages/patches/ganeti-drbd-compat.patch                        \
   %D%/packages/patches/ganeti-haskell-pythondir.patch          \
   %D%/packages/patches/ganeti-os-disk-size.patch               \
-  %D%/packages/patches/ganeti-preserve-PYTHONPATH.patch                \
   %D%/packages/patches/ganeti-shepherd-master-failover.patch   \
   %D%/packages/patches/ganeti-shepherd-support.patch           \
   %D%/packages/patches/gash-utils-ls-test.patch                        \
diff --git a/gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch 
b/gnu/packages/patches/ganeti-preserve-PYTHONPATH.patch
deleted file mode 100644
index 1358e30..0000000
--- 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 4470bed..f80aebd 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