diff options
| author | Richard Maw <richard.maw@codethink.co.uk> | 2014-04-22 09:58:47 +0000 |
|---|---|---|
| committer | Richard Maw <richard.maw@codethink.co.uk> | 2014-04-22 09:58:47 +0000 |
| commit | b8f2100e3f7fbff990d4f28c71f9c7a178b5d8f0 (patch) | |
| tree | 515811ca56288834947d44f6c4d7d13f6213f906 | |
| parent | 7c2f16a1526b2abebd967e842c665b6ac67c63cf (diff) | |
| parent | 3a4276f0dca8c5b6a978c83e4d468fccb75b4ed5 (diff) | |
| download | morph-b8f2100e3f7fbff990d4f28c71f9c7a178b5d8f0.tar.gz | |
Merge remote-tracking branch 'origin/baserock/ps/fix-virtualbox-version-checking'
Reviewed-by: Richard Maw
Reviewed-by: Pedro Alvarez
| -rwxr-xr-x | morphlib/exts/virtualbox-ssh.write | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/morphlib/exts/virtualbox-ssh.write b/morphlib/exts/virtualbox-ssh.write index 2a2f3f7b..b9d53579 100755 --- a/morphlib/exts/virtualbox-ssh.write +++ b/morphlib/exts/virtualbox-ssh.write @@ -116,7 +116,7 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension): # comparing against the major, minor and patch numbers directly self.status(msg='Checking version of remote VirtualBox') build_id = cliapp.ssh_runcmd(ssh_host, ['VBoxManage', '--version']) - version_string = re.match(r"^([0-9\.])+.*$", build_id.strip()).group(1) + version_string = re.match(r"^([0-9\.]+).*$", build_id.strip()).group(1) return tuple(int(s or '0') for s in version_string.split('.')) def create_virtualbox_guest(self, ssh_host, vm_name, vdi_path, autostart): @@ -130,7 +130,7 @@ class VirtualBoxPlusSshWriteExtension(morphlib.writeexts.WriteExtension): hostonly_iface = self.get_host_interface(ssh_host) - if self.virtualbox_version(ssh_host) < (4, 3): + if self.virtualbox_version(ssh_host) < (4, 3, 0): sataportcount_option = '--sataportcount' else: sataportcount_option = '--portcount' |