01/01: gnu: gajim: Fix error when GAJIM_PLUGIN_PATH is not set.

[guix-commits]

rekado pushed a commit to branch master
in repository guix.

commit a624c3631077aa3fa5c05849579932c5b67b985c
Author: Ricardo Wurmus <address@hidden>
Date:   Mon May 13 09:00:55 2019 +0200

    gnu: gajim: Fix error when GAJIM_PLUGIN_PATH is not set.
    
    Fixes <https://bug.gnu.org/35606>
    
    * gnu/packages/messaging.scm (gajim)[arguments]: Handle case when
    GAJIM_PLUGIN_PATH is unset in add-plugins-dir phase.
---
 gnu/packages/messaging.scm | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/gnu/packages/messaging.scm b/gnu/packages/messaging.scm
index 94d4b08..45e9d40 100644
--- a/gnu/packages/messaging.scm
+++ b/gnu/packages/messaging.scm
@@ -594,8 +594,12 @@ was initially a fork of xmpppy, but uses non-blocking 
sockets.")
          (add-after 'unpack 'add-plugin-dirs
            (lambda _
              (substitute* "gajim/common/configpaths.py"
-               (("_paths\\['PLUGINS_USER'\\]")
-                "_paths['PLUGINS_USER'],os.getenv('GAJIM_PLUGIN_PATH')"))
+               (("_paths\\['PLUGINS_USER'\\]\\]")
+                "_paths['PLUGINS_USER']] + \
+([os.getenv('GAJIM_PLUGIN_PATH')] \
+if os.getenv('GAJIM_PLUGIN_PATH') \
+and Path(os.getenv('GAJIM_PLUGIN_PATH')).is_dir() \
+else [])"))
              #t))
          (replace 'check
            (lambda _