diff options
| author | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-03-19 17:25:02 -0400 |
|---|---|---|
| committer | Davanum Srinivas <dims@linux.vnet.ibm.com> | 2013-03-19 17:38:56 -0400 |
| commit | 2b3a2979fe0c6cc41088c19fab5908a86cc855e3 (patch) | |
| tree | 4afe87042afc1d40371a0c2d6273a2d6d8871127 /nova/virt | |
| parent | 98f9f735d7e6ac32a8736971f4aab0d81c56131e (diff) | |
| download | nova-2b3a2979fe0c6cc41088c19fab5908a86cc855e3.tar.gz nova-2b3a2979fe0c6cc41088c19fab5908a86cc855e3.tar.xz nova-2b3a2979fe0c6cc41088c19fab5908a86cc855e3.zip | |
Fix missing argument to QemuImageInfo
set the default value for cmd_output to None. _parse
does work fine with None or empty string
Fixes LP# 1157412
Change-Id: Ib63f2fd227633b96db613ce29563d1929536819a
Diffstat (limited to 'nova/virt')
| -rwxr-xr-x | nova/virt/images.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/nova/virt/images.py b/nova/virt/images.py index 50d89bfb8..b40f566a6 100755 --- a/nova/virt/images.py +++ b/nova/virt/images.py @@ -49,7 +49,7 @@ class QemuImgInfo(object): TOP_LEVEL_RE = re.compile(r"^([\w\d\s\_\-]+):(.*)$") SIZE_RE = re.compile(r"\(\s*(\d+)\s+bytes\s*\)", re.I) - def __init__(self, cmd_output): + def __init__(self, cmd_output=None): details = self._parse(cmd_output) self.image = details.get('image') self.backing_file = details.get('backing_file') |