From e68949b04e2125c92ea44eb0b01cb4813380ef7d Mon Sep 17 00:00:00 2001
From: Agata Murawska <agatamurawska@google.com>
Date: Thu, 20 Oct 2011 17:20:11 +0200
Subject: [PATCH] ovfconverter: use qemu-img path from constants
Signed-off-by: Agata Murawska <agatamurawska@google.com>
Reviewed-by: Guido Trotter <ultrotter@google.com>
---
lib/ovf.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/lib/ovf.py b/lib/ovf.py
index c26107e0a..ef87ae371 100644
--- a/lib/ovf.py
+++ b/lib/ovf.py
@@ -938,7 +938,7 @@ class Converter(object):
prefix=disk_name, dir=self.output_dir)
self.temp_file_manager.Add(new_disk_path)
args = [
- "qemu-img",
+ constants.QEMUIMG_PATH,
"convert",
"-O",
disk_format,
@@ -966,7 +966,7 @@ class Converter(object):
"""
CheckQemuImg()
- args = ["qemu-img", "info", disk_path]
+ args = [constants.QEMUIMG_PATH, "info", disk_path]
run_result = utils.RunCmd(args, cwd=os.getcwd())
if run_result.failed:
raise errors.OpPrereqError("Gathering info about the disk using qemu-img"
@@ -1343,7 +1343,7 @@ class OVFImporter(Converter):
(disk_id, disk_desc["size"]))
new_path = utils.PathJoin(self.output_dir, str(disk_id))
args = [
- "qemu-img",
+ constants.QEMUIMG_PATH,
"create",
"-f",
"raw",
--
GitLab