From cf55729f93d50efe23dbee7a524ed0ebc9a2d712 Mon Sep 17 00:00:00 2001 From: Jay Greguske Date: Fri, 24 Jan 2014 17:33:13 -0500 Subject: [PATCH] fix raw format behavior --- builder/kojid | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/builder/kojid b/builder/kojid index c10eb509..5d9ec585 100755 --- a/builder/kojid +++ b/builder/kojid @@ -2728,7 +2728,7 @@ class BaseImageTask(OzImageTask): we have to do this. rhevm-ova requires rhevm, but if the user did not request it, we should not pass it back up. """ - supported = ('vmdk', 'qcow', 'qcow2', 'vdi', 'rhevm-ova', 'vsphere-ova') + supported = ('raw', 'vmdk', 'qcow', 'qcow2', 'vdi', 'rhevm-ova', 'vsphere-ova') for f in formats: if f not in supported: raise koji.ApplianceError('Invalid format: %s' % f) @@ -2742,7 +2742,7 @@ class BaseImageTask(OzImageTask): if len(formats) == 0: # we only want a raw disk image (no format option given) f_dict['raw'] = True - else: + elif 'raw' not in f_dict.keys(): f_dict['raw'] = False self.logger.debug('Image delivery plan: %s' % f_dict) return f_dict