From 666f9f802d241e4c82ebeeaa5a3b48a454422a0c Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 14 Nov 2012 20:17:09 -0800 Subject: [PATCH] When upgrading V1 `vm` config, don't set on new if it wasn't set before --- plugins/kernel_v1/config/vm.rb | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/plugins/kernel_v1/config/vm.rb b/plugins/kernel_v1/config/vm.rb index 27f6d2449..81fcf0885 100644 --- a/plugins/kernel_v1/config/vm.rb +++ b/plugins/kernel_v1/config/vm.rb @@ -122,13 +122,13 @@ module VagrantPlugins # Upgrade to a V2 configuration def upgrade(new) - new.vm.auto_port_range = self.auto_port_range - new.vm.base_mac = self.base_mac - new.vm.boot_mode = self.boot_mode - new.vm.box = self.box - new.vm.box_url = self.box_url - new.vm.guest = self.guest - new.vm.host_name = self.host_name + new.vm.auto_port_range = self.auto_port_range if self.auto_port_range + new.vm.base_mac = self.base_mac if self.base_mac + new.vm.boot_mode = self.boot_mode if self.boot_mode + new.vm.box = self.box if self.box + new.vm.box_url = self.box_url if self.box_url + new.vm.guest = self.guest if self.guest + new.vm.host_name = self.host_name if self.host_name # XXX: Warning: `vm.name` is useless now end