[Spice-devel] [PATCH qxl] Xspice: Don't set defaults for the options.

[Christophe Fergeau]

On Mon, Jun 08, 2015 at 05:52:59PM +0200, Francois Gouget wrote:
> Otherwise they override Spice server's real builtin defaults, the Xorg configuration file settings, and even the XSPICE_XXX environment variables.
> ---
> 
> Without this patch, calling Xspice _without_ the '--streaming-video' 
> option forces this setting to 'filter', overriding the 
> XSPICE_STREAMING_VIDEO environment variable and the SpiceStreamingVideo 
> spiceqxl.xorg.conf setting.

fwiw this belongs to the commit log, not below '---'

> 
>  scripts/Xspice | 16 ++++++++--------
>  1 file changed, 8 insertions(+), 8 deletions(-)
> 
> diff --git a/scripts/Xspice b/scripts/Xspice
> index 281535d..f565eb1 100755
> --- a/scripts/Xspice
> +++ b/scripts/Xspice
> @@ -45,7 +45,7 @@ else:
>      cgdb = None
>  
>  def add_boolean(flag, *args, **kw):
> -    parser.add_argument(flag, action='store_const', const='1', default='0',
> +    parser.add_argument(flag, action='store_const', const='1',
>                          *args, **kw)
>  
>  wan_compression_options = ['auto', 'never', 'always']
> @@ -65,7 +65,7 @@ parser.add_argument('--deferred-fps', type=int, help='If given, render to a buff
>  parser.add_argument('--tls-port', type=int, help='spice tls port', default=0)
>  add_boolean('--disable-ticketing', help="do not require a client password")
>  add_boolean('--sasl', help="enable sasl")
> -parser.add_argument('--x509-dir', help="x509 directory for tls", default='.')
> +parser.add_argument('--x509-dir', help="x509 directory for tls")
>  parser.add_argument('--cacert-file', help="ca certificate file for tls")
>  parser.add_argument('--x509-cert-file', help="server certificate file for tls")
>  parser.add_argument('--x509-key-file', help="server key file for tls")
> @@ -76,16 +76,16 @@ parser.add_argument('--password', help="set password required to connect to serv
>  parser.add_argument('--image-compression',
>                      choices = ['off', 'auto_glz', 'auto_lz', 'quic',
>                                 'glz', 'lz'],
> -                    default='auto_glz', help='auto_glz by default')
> +                    help='auto_glz by default')

I think these help strings should be reworked now, like 'use
spice-server defaults (auto_glz)' or something like that.
I assume default behaviour (ie when no args/env vars are used) is
unchanged before/after this patch?

Looks good apart from that.

Christophe
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.freedesktop.org/archives/spice-devel/attachments/20150810/187a5771/attachment.sig>