Merge lp://qastaging/~huerlisi/vmbuilder/dev into lp://qastaging/vmbuilder
Proposed by
Simon Huerlimann
Status: | Merged | ||||
---|---|---|---|---|---|
Approved by: | Soren Hansen | ||||
Approved revision: | no longer in the source branch. | ||||
Merged at revision: | 452 | ||||
Proposed branch: | lp://qastaging/~huerlisi/vmbuilder/dev | ||||
Merge into: | lp://qastaging/vmbuilder | ||||
Diff against target: |
132 lines (+30/-16) 4 files modified
VMBuilder/contrib/cli.py (+23/-13) VMBuilder/disk.py (+1/-1) VMBuilder/plugins/kvm/vm.py (+4/-0) VMBuilder/plugins/ubuntu/distro.py (+2/-2) |
||||
To merge this branch: | bzr merge lp://qastaging/~huerlisi/vmbuilder/dev | ||||
Related bugs: |
|
Reviewer | Review Type | Date Requested | Status |
---|---|---|---|
Soren Hansen | Approve | ||
Review via email: mp+24724@code.qastaging.launchpad.net |
Description of the change
Hi Soren
Here's my attempt at helping to make vmbuilder the simplest VM builder on Earth;-)
My branch contains the following changes:
* Some typo/language fixes
* Support for swapsize == 0, thereby fixing Launchpad bug #403149
* Support more than one raw devices, including support for partition files
Currently mostly doing coding using Ruby/Git/Github, this is my first attempt at Python/
Thanx for all the good stuff and kind regards
Simon Hürlimann
To post a comment you must log in.
On Wed, May 05, 2010 at 06:32:29AM -0000, Simon Huerlimann wrote:
> Simon Huerlimann has proposed merging lp:~huerlisi/vmbuilder/dev into lp:vmbuilder.
Thank you! Please accept my apologies for the delay. I'll try to respond
in a more timely fashion in the future.
> @@ -234,29 +238,35 @@ options. part): ).split( ' ',1) distro. preferred_ filesystem( ) add_disk( util.tmpfile( keep=False) , size+1) debug(" do_disk - size: %d" % size) add_disk( filename= self.options. raw[count] )
> try:
> curdisk = list()
> size = 0
> + count = 0
> for line in file(self.
> pair = line.strip(
[...]
> + def do_disk(self, hypervisor, curdisk, size, count):
> default_filesystem = hypervisor.
> - disk = hypervisor.
> - logging.
> + if self.options.raw:
> + disk = hypervisor.
I took the liberty of renaming "count" to "disk_idx" for clarity.
Other than that, it looks great.
review approve
merge approved
-- www.ubuntu. com/
Soren Hansen
Ubuntu Developer
http://