[PATCH] ensure qcow2 v2 compatible output regardless of local qemu-img version

[Colin Walters]

On Wed, Oct 7, 2015, at 02:21 PM, Ian McLeod wrote:

> @@ -3318,8 +3320,18 @@ class BaseImageTask(OzImageTask):
>          newimg = os.path.join(self.workdir, self.imgname + '.%s' % ofmt)
>          cmd = ['/usr/bin/qemu-img', 'convert', '-f', 'raw', '-O',
>              format, self.base_img.base_image.data, newimg]

I think the separation between the qcow and qcow2 cases you've
made here would be clearer if the above line was just underneath
the 'qcow' case below, as it's just overwritten by the 'qcow2'
conditional.

Might also be worth linking to
https://github.com/redhat-imaging/imagefactory/commit/7434c9e7506d5896508c23983b55544b0b244164
in the commit message here.

Otherwise, looks reasonable.