[X2Go-Commits] [x2goserver] 74/99: x2goserver/bin/x2goupdateoptionsstring: fix syntax and strict mode errors.

[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 e3c0c52d003967ec583fe664044b06449bd9c80a
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sun Nov 29 06:46:24 2020 +0100

    x2goserver/bin/x2goupdateoptionsstring: fix syntax and strict mode errors.
---
 debian/changelog                       | 2 ++
 x2goserver/bin/x2goupdateoptionsstring | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a27759b1..82572d4e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -336,6 +336,8 @@ x2goserver (4.1.0.4-0x2go1.2) UNRELEASED; urgency=medium
     - x2goserver/bin/x2goupdateoptionsstring: sanitize/convert data in @ARGV.
     - x2goserver/bin/x2goupdateoptionsstring: add non-functional extraction
       mode. Needs proper implementation.
+    - x2goserver/bin/x2goupdateoptionsstring: fix syntax and strict mode
+      errors.
   * 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 b0201629..69848a26 100755
--- a/x2goserver/bin/x2goupdateoptionsstring
+++ b/x2goserver/bin/x2goupdateoptionsstring
@@ -561,13 +561,13 @@ sub Main {
       elsif ((MODE_EXTRACT_DATA)[1] == $mode) {
         my $extract = extract_data ($intermediate, $cur_arg, $debug);
 
-        if (!(defined ($extract)) {
+        if (!(defined ($extract))) {
           print {*STDERR} 'Unable to extract data for "' . $cur_arg . '"' . ", aborting.\n";
           $error_detected = 11;
         }
         else {
           # Convert into bytes.
-          $bytes = encode ("UTF-8", $extract, Encode::FB_CROAK);
+          my $bytes = encode ("UTF-8", $extract, Encode::FB_CROAK);
 
           # Encode the data.
           my $base64 = base64_encode ($extract, q{});

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