From 0333d3dbf4a8e26e4aaa49716c96ae72d0aba2d7 Mon Sep 17 00:00:00 2001
From: Bob Lantz <rlantz@cs.stanford.edu>
Date: Thu, 4 Sep 2014 21:51:21 -0700
Subject: [PATCH] qcow2size(): use qemu-image instead of file
file no longer returns image size on 14.04
fixes #373
---
util/vm/build.py | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/util/vm/build.py b/util/vm/build.py
index 5063fb1b..eb0206cc 100755
--- a/util/vm/build.py
+++ b/util/vm/build.py
@@ -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
--
GitLab