[X2Go-Commits] [x2goserver] 02/15: x2goserver/bin/x2gooptionsstring: actually default to transformation mode if none was explicitly selected.

[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 x2goserver.

commit 2dd7dab4ecb39f68ac4690444d00c259e5d24755
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Jan 3 19:24:18 2021 +0100

    x2goserver/bin/x2gooptionsstring: actually default to transformation mode if none was explicitly selected.
---
 debian/changelog                 | 2 ++
 x2goserver/bin/x2gooptionsstring | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 2bd19876..85d6387b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -383,6 +383,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
     - x2goserver/bin/x2gooptionsstring: rename x2goupdateoptionsstring to
       x2gooptionsstring.
     - x2goserver/bin/x2gostartagent: fetch the agent PID as early as possible.
+    - x2goserver/bin/x2gooptionsstring: actually default to transformation
+      mode if none was explicitly selected.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/bin/x2gooptionsstring b/x2goserver/bin/x2gooptionsstring
index 303af2da..408baf36 100755
--- a/x2goserver/bin/x2gooptionsstring
+++ b/x2goserver/bin/x2gooptionsstring
@@ -331,6 +331,10 @@ sub handle_mode {
         }
       }
     }
+    elsif ((!($transform)) && (!($extract))) {
+      # No mode explicitly passed in, default to transformation mode.
+      $mode_aggregate |= (&{(MODES)[0]}())[1];
+    }
   }
 
   # Okay, now check for mutual exclusiveness and map to return value.

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