diff --git a/ChangeLog b/ChangeLog index 89f87d94ce8418f7aaea135a04ef23849a0ad15f..4e92770f46282afcd9d57c9c3ab1480e4401b611 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,4 @@ -2014-09-12, v0.7rc2 +2014-09-16, v0.7rc3 * Support all QEMU supported disk image formats as input media * Detect if a Windows input media is sysprepped * Support VirtIO driver installation in Windows diff --git a/image_creator/util.py b/image_creator/util.py index c38e5a4f943c4ed78ade70eec465ca04a1478198..35d2ed152088657ff223e8e7fcd4188ec692873c 100644 --- a/image_creator/util.py +++ b/image_creator/util.py @@ -51,7 +51,16 @@ def image_info(image): """Returns information about an image file""" qemu_img = get_command('qemu-img') - info = qemu_img('info', '--output', 'json', image) + try: + info = qemu_img('info', '--output', 'json', image) + except sh.ErrorReturnCode_1: + # Old version of qemu-img that does not support --output json + info = qemu_img('info', image) + for line in str(info).splitlines(): + if line.startswith('file format:'): + format = line.split(':')[1].strip() + return {'format': format} + raise FatalError("Unable to determine the image format") return json.loads(str(info)) diff --git a/image_creator/version.py b/image_creator/version.py index c3fc276ffd32ea11b0ab818a049feb6874b81a4b..552e971299e384d19e57f72c4febd0bd246ce160 100644 --- a/image_creator/version.py +++ b/image_creator/version.py @@ -1,8 +1,8 @@ -__version__ = "0.7rc2" +__version__ = "0.7rc3" __version_vcs_info__ = { 'branch': 'release-0.7', - 'revid': '9813162', - 'revno': 564} + 'revid': 'd595255', + 'revno': 566} __version_user_email__ = "skalkoto@grnet.gr" __version_user_name__ = "Nikos Skalkotos" diff --git a/version b/version index 22e9674151c70675fea07f7ed4dbed62fabfdc4a..c4a3727fb19b9ddf687bdd364194aa7576ac3dbc 100644 --- a/version +++ b/version @@ -1 +1 @@ -0.7rc2 +0.7rc3