This is an automated email from the git hooks/post-receive script. x2go pushed a commit to branch master in repository x2goserver. commit 043c6623a4922de503cc9449fbf98d2dec5196ab Author: Mihai Moldovan <ionic@ionic.de> Date: Wed Dec 12 10:30:27 2018 +0100 x2goserver/lib/x2goupdateoptionsstring: fix debug string and add another one dumping the raw options string. --- debian/changelog | 2 ++ x2goserver/lib/x2goupdateoptionsstring | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 07deb10..e26f649 100644 --- a/debian/changelog +++ b/debian/changelog @@ -57,6 +57,8 @@ x2goserver (4.1.0.4-0x2go1) UNRELEASED; urgency=medium program options parsing when no longer needed. - x2goserver/lib/x2goupdateoptionsstring: don't debug-output the intermediate representation if we know that parsing failed. + - x2goserver/lib/x2goupdateoptionsstring: fix debug string and add another + one dumping the raw options string. * 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 48da644..06d82a5 100755 --- a/x2goserver/lib/x2goupdateoptionsstring +++ b/x2goserver/lib/x2goupdateoptionsstring @@ -700,13 +700,17 @@ sub Main { my $options = shift; if (!(defined ($options))) { - print {*STDERR} "No or invalid options string given, aborting.\n"; + print {*STDERR} "No options string given, aborting.\n"; $error_detected = 4; } my $intermediate = undef; if (!($error_detected)) { + if ($debug) { + print {*STDERR} 'Fetched options string as: ' . Dumper (\$options); + } + $intermediate = parse_options ($options); if (!(defined ($intermediate))) { -- Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/x2goserver.git