[X2Go-Commits] [python-x2go] 01/02: Make pyhoca-cli work for users with (t)csh as login shell

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository python-x2go.

commit af7893973587be8cf0d28217473e462d544b6f4c
Author: Ulrich Sibiller <uli42 at gmx.de>
Date:   Tue Apr 27 20:46:18 2021 +0200

    Make pyhoca-cli work for users with (t)csh as login shell
    
    Fixes pyhoca-cli failing with "remote home directory does not exist"
    
    Thanks to Anselm Kruis for finding and fixing this bug.
---
 debian/changelog               | 5 +++++
 x2go/backends/control/plain.py | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index f482176..7bd3898 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,13 @@
 python-x2go (0.6.1.5-0x2go1) UNRELEASED; urgency=medium
 
+  [ Mihai Moldovan ]
   * New upstream version (0.6.1.5):
     - x2go/backends/terminal/plain.py: Typo fix in docstring.
 
+  [ Ulrich Sibiller / Anselm Kruis ]
+  * New upstream version (0.6.1.5):
+    - fix pyhoca-cli failing for users with (t)csh as login shell
+
  -- X2Go Release Manager <git-admin at x2go.org>  Sun, 20 Aug 2023 04:21:30 +0200
 
 python-x2go (0.6.1.4-0x2go1) unstable; urgency=medium
diff --git a/x2go/backends/control/plain.py b/x2go/backends/control/plain.py
index 38aae5b..955b8d1 100644
--- a/x2go/backends/control/plain.py
+++ b/x2go/backends/control/plain.py
@@ -469,7 +469,7 @@ class X2GoControlSession(paramiko.SSHClient):
             cmd = cmd_line
 
         cmd_uuid = str(uuid.uuid1())
-        cmd = 'echo X2GODATABEGIN:%s; PATH=/usr/local/bin:/usr/bin:/bin sh -c \"%s\"; echo X2GODATAEND:%s' % (cmd_uuid, cmd, cmd_uuid)
+        cmd = 'echo X2GODATABEGIN:%s; env PATH=/usr/local/bin:/usr/bin:/bin sh -c \"%s\"; echo X2GODATAEND:%s' % (cmd_uuid, cmd, cmd_uuid)
 
         if self.session_died:
             self.logger("control session seams to be dead, not executing command ,,%s'' on X2Go server %s" % (_rerewrite_blanks(cmd), self.profile_name,), loglevel=loglevel)

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/python-x2go.git