[Pkg-tigervnc-devel] [Git][debian-remote-team/tigervnc][master] 2 commits: Clear config file session arguments if -xstartup specified on cmdline.

[Joachim Falk (@jfalk-guest)]

Joachim Falk pushed to branch master at Debian Remote Packaging Team / tigervnc


Commits:
5cab35ed by Joachim Falk at 2022-01-14T01:04:16+01:00
Clear config file session arguments if -xstartup specified on cmdline.

- - - - -
c3e087b2 by Joachim Falk at 2022-01-14T01:09:32+01:00
Updated debian changelog again.

- - - - -


2 changed files:

- debian/changelog
- debian/helpers/usr/share/perl5/TigerVNC/Config.pm


Changes:

=====================================
debian/changelog
=====================================
@@ -11,6 +11,8 @@ tigervnc (1.12.0+dfsg-1~RC5) unstable; urgency=medium
   * Fixed some lintian errors.
   * Bumped Standards-Version: to 4.6.0. No changes were needed.
   * Fixed typo in tigervncserver man page.
+  * Clear config file session arguments if -xstartup specified on cmdline.
+    (Closes: #1000871)
 
  -- Joachim Falk <joachim.falk at gmx.de>  Thu, 13 Jan 2022 23:43:24 +0100
 


=====================================
debian/helpers/usr/share/perl5/TigerVNC/Config.pm
=====================================
@@ -227,6 +227,11 @@ sub handleVNCStartupAuto {
   if (defined($options->{'vncStartup'}) && $options->{'vncStartup'} eq '__AUTO__') {
     # vncStartup was not defined by the user configuration in ~/.vnc/vnc.conf.
     $options->{'vncStartup'} = $vncStartupAuto;
+  } elsif (($options->{'src'}{'vncStartup'} // "undef") eq 'cmdline' &&
+	   ($options->{'src'}{'session-orig'} // "undef") ne 'cmdline') {
+    # Clear config file session arguments if -xstartup specified on cmdline.
+    $options->{'src'}{'session-orig'} = 'cmdline';
+    $options->{'session-orig'} = $options->{'session'} = [];
   }
 }
 



View it on GitLab: https://salsa.debian.org/debian-remote-team/tigervnc/-/compare/dc0ec2b9d7a55fce1c1d43b786e5e4bb42f77eb2...c3e087b222ba5dd4f9f442b079eab89433656583

-- 
View it on GitLab: https://salsa.debian.org/debian-remote-team/tigervnc/-/compare/dc0ec2b9d7a55fce1c1d43b786e5e4bb42f77eb2...c3e087b222ba5dd4f9f442b079eab89433656583
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-tigervnc-devel/attachments/20220114/7b5a12c5/attachment.htm>