[X2Go-Commits] [x2goserver] 85/99: x2goserver/bin/x2goupdateoptionsstring: fix error handling for kv-pair extraction.

[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 8258288e10bb8a17e104aa99a3b7ad5e86c1169b
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Thu Dec 10 04:12:30 2020 +0100

    x2goserver/bin/x2goupdateoptionsstring: fix error handling for kv-pair extraction.
---
 debian/changelog                       | 2 ++
 x2goserver/bin/x2goupdateoptionsstring | 1 +
 2 files changed, 3 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index e7c9ca9c..27afe320 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -360,6 +360,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
       reword misinterpreted-as-options section.
     - x2goserver/bin/x2goupdateoptionsstring: document mode selection and
       extraction mode.
+    - x2goserver/bin/x2goupdateoptionsstring: fix error handling for kv-pair
+      extraction.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/bin/x2goupdateoptionsstring b/x2goserver/bin/x2goupdateoptionsstring
index f7c4a2d7..d05d290b 100755
--- a/x2goserver/bin/x2goupdateoptionsstring
+++ b/x2goserver/bin/x2goupdateoptionsstring
@@ -649,6 +649,7 @@ sub Main {
         if (!(defined ($extract))) {
           print {*STDERR} 'Unable to extract data for "' . $cur_arg . '"' . ", aborting.\n";
           $error_detected = 11;
+          last;
         }
         else {
           # Convert into bytes.

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