Merge lp:~lfaraone/vmbuilder/lp580237 into lp:vmbuilder

[Luke Faraone]

This branch fixes LP: #580237 by updating the way the VirtualBox plugin adds settings.

[Soren Hansen (soren)]

review: Approve

[Soren Hansen (soren)]

Looks good, thank you! Sorry about the delay.

=== modified file 'VMBuilder/plugins/virtualbox/vm.py'
--- VMBuilder/plugins/virtualbox/vm.py	2010-02-25 08:57:20 +0000
+++ VMBuilder/plugins/virtualbox/vm.py	2010-05-19 17:12:29 +0000
@@ -32,9 +32,8 @@
     arg = 'vbox'
 
     def register_options(self):
-        group = self.context.setting_group('VirtualBox options')
-        group.add_option('--vbox-disk-format', metavar='FORMAT', default='vdi', help='Desired disk format. Valid options are: vdi vmdk. [default: %default]')
-        self.context.register_setting_group(group)
+        group = self.setting_group('VM settings')
+        group.add_setting('vbox-disk-format', metavar='FORMAT', default='vdi', help='Desired disk format. Valid options are: vdi vmdk. [default: %default]')
 
     def finalize(self):
         self.imgs = []