Merge lp:~keyz182/vmbuilder/bugfix-lp-688213 into lp:vmbuilder

Proposed by Kieran Evans
Status: Superseded
Proposed branch: lp:~keyz182/vmbuilder/bugfix-lp-688213
Merge into: lp:vmbuilder
Diff against target: 17 lines (+5/-2)
1 file modified
VMBuilder/contrib/cli.py (+5/-2)
To merge this branch: bzr merge lp:~keyz182/vmbuilder/bugfix-lp-688213
Reviewer Review Type Date Requested Status
VMBuilder Pending
Review via email: mp+43788@code.launchpad.net

This proposal has been superseded by a proposal from 2011-03-04.

Commit message

A small change that allows you to specify a fourth option in a part file added through the --part switch which specifies a name of the output file for the partition

Description of the change

A small change that allows you to specify a fourth option in a part file added through the --part switch which specifies a name of the output file for the partition

To post a comment you must log in.
461. By Kieran Evans

Update to examples and manpage to reflect changes to partfile options.

Unmerged revisions

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'VMBuilder/contrib/cli.py'
2--- VMBuilder/contrib/cli.py 2010-07-09 21:48:56 +0000
3+++ VMBuilder/contrib/cli.py 2010-12-15 16:20:13 +0000
4@@ -340,8 +340,11 @@
5 try:
6 for line in file(self.options.part):
7 elements = line.strip().split(' ')
8- tmpfile = util.tmp_filename(
9- tmp_root=self.options.tmp_root)
10+ if not elements[3]:
11+ tmpfile = util.tmp_filename(tmp_root=self.options.tmp_root)
12+ else:
13+ tmpfile = elements[3]
14+
15 if elements[0] == 'root':
16 hypervisor.add_filesystem(elements[1],
17 default_filesystem,

Subscribers

People subscribed via source and target branches