[virt-tools-list] [virt-manager PATCH] virt-image: hide "qcow" from error message

[Cole Robinson]

On 05/12/2014 06:09 AM, Giuseppe Scrivano wrote:
> Closes: https://bugzilla.redhat.com/show_bug.cgi?id=1095204
> 
> Signed-off-by: Giuseppe Scrivano <gscrivan at redhat.com>
> ---
>  virtinst/virtimage.py | 6 +++++-
>  1 file changed, 5 insertions(+), 1 deletion(-)
> 
> diff --git a/virtinst/virtimage.py b/virtinst/virtimage.py
> index 96871ae..14c67ee 100644
> --- a/virtinst/virtimage.py
> +++ b/virtinst/virtimage.py
> @@ -241,9 +241,13 @@ class Disk(object):
>                     Disk.FORMAT_VMDK,
>                     Disk.FORMAT_ISO,
>                     Disk.FORMAT_VDI]
> +
> +        hide = [Disk.FORMAT_QCOW]
> +
>          validate(formats.count(self.format) > 0,
>                   _("The format for disk %s must be one of %s") %
> -                 (self.file, ",".join(formats)))
> +                 (self.file, ", ".join([x for x in formats if x not in hide])))
> +
>  
>      def check_disk_signature(self, meter=None):
>          try:
> 

This should be RHEL only, since there's no reason to hide it with upstream
since qcow is a valid option.

If you wanted to have a valid upstream patch, it should be hidden behind the
rhel configure switch, but in practice it doesn't matter since RHEL7 doesn't
ship virt-image.

- Cole