[X2Go-Commits] [x2goserver] 23/30: x2goserver/lib/x2goupdateoptionsstring: don't debug-output the intermediate representation if we know that parsing failed.

[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 b5f6c039e99787ebf8b56a02cd157ab8a3c9d634
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Wed Dec 12 10:22:36 2018 +0100

    x2goserver/lib/x2goupdateoptionsstring: don't debug-output the intermediate representation if we know that parsing failed.
---
 debian/changelog                       | 2 ++
 x2goserver/lib/x2goupdateoptionsstring | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f6909d5..07deb10 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -55,6 +55,8 @@ x2goserver (4.1.0.4-0x2go1) UNRELEASED; urgency=medium
     - x2goserver/lib/x2goupdateoptionsstring: update documentation and clarify
       risks of option parsing. It's better to always use -- to terminate
       program options parsing when no longer needed.
+    - x2goserver/lib/x2goupdateoptionsstring: don't debug-output the
+      intermediate representation if we know that parsing failed.
   * debian/control:
     + Build-depend upon lsb-release for distro version detection.
   * debian/x2goserver.manpages:
diff --git a/x2goserver/lib/x2goupdateoptionsstring b/x2goserver/lib/x2goupdateoptionsstring
index 6e304e8..48da644 100755
--- a/x2goserver/lib/x2goupdateoptionsstring
+++ b/x2goserver/lib/x2goupdateoptionsstring
@@ -715,13 +715,13 @@ sub Main {
     }
   }
 
-  if ($debug) {
-    print {*STDERR} 'Dumping intermediate array after initial parsing: ' . Dumper ($intermediate);
-  }
-
   if (!($error_detected)) {
     my $cur_transform = shift;
 
+    if ($debug) {
+      print {*STDERR} 'Dumping intermediate array after initial parsing: ' . Dumper ($intermediate);
+    }
+
     # Nasty trick (to some degree): "do"-blocks are not recognized as loops by
     # Perl, but we can wrap the body in another block, which WILL BE recognized
     # as a loop (one, that only executes once), oddly enough.

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