[virt-tools-list] [virt-manager PATCH] virtinst: do not add default channels if one is already present

[Cole Robinson]

Can we get a clitest XML comparsion to verify the change?

Thanks,
Cole

On 01/08/2015 10:59 AM, Giuseppe Scrivano wrote:
> Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1179680
> 
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---
>  virtinst/cli.py | 7 ++++---
>  1 file changed, 4 insertions(+), 3 deletions(-)
> 
> diff --git a/virtinst/cli.py b/virtinst/cli.py
> index 00294fb..4748e07 100644
> --- a/virtinst/cli.py
> +++ b/virtinst/cli.py
> @@ -1,7 +1,7 @@
>  #
>  # Utility functions for the command line drivers
>  #
> -# Copyright 2006-2007, 2013, 2014 Red Hat, Inc.
> +# Copyright 2006-2007, 2013, 2014, 2015 Red Hat, Inc.
>  # Jeremy Katz <katzj at redhat.com>
>  #
>  # This program is free software; you can redistribute it and/or modify
> @@ -2002,9 +2002,10 @@ class _ParserChar(VirtCLIParser):
>          if opts.fullopts == "none" and inst.virtual_device_type == "console":
>              self.guest.skip_default_console = True
>              return
> -        if opts.fullopts == "none" and inst.virtual_device_type == "channel":
> +        if inst.virtual_device_type == "channel":
>              self.guest.skip_default_channel = True
> -            return
> +            if opts.fullopts == "none":
> +                return
>  
>          return VirtCLIParser._parse(self, opts, inst)
>  
>