qcow2size(): use qemu-image instead of file

file no longer returns image size on 14.04 fixes #373
2014-09-04 21:51:21 -07:00
parent f2458d1dcf
commit 0333d3dbf4
1 changed files with 6 additions and 3 deletions
@@ -728,9 +728,12 @@ def generateOVF( name, osname, osid, diskname, disksize, mem=1024, cpus=1,

 def qcow2size( qcow2 ):
    "Return virtual disk size (in bytes) of qcow2 image"
-    output = check_output( [ 'file', qcow2 ] )
-    assert 'QCOW' in output
-    bytes = int( re.findall( '(\d+) bytes', output )[ 0 ] )
+    output = check_output( [ 'qemu-img', 'info', qcow2 ] )
+    try:
+        assert 'format: qcow' in output
+        bytes = int( re.findall( '(\d+) bytes', output )[ 0 ] )
+    except:
+        raise Exception( 'Could not determine size of %s' % qcow2 )
    return bytes