Merge branch 'release-0.7' into debian-release-0.7-precise

ChangeLog

-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

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))
 
 

image_creator/version.py

 
-__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"

version

-0.7rc2
+0.7rc3