VMBuilder

Merge lp:~barry/vmbuilder/bug-612082 into lp:vmbuilder

  1. bug-612082
  2. Merge into 0.12
Proposed by Barry Warsaw
Status: Merged
Merged at revision: 472
Proposed branch: lp:~barry/vmbuilder/bug-612082
Merge into: lp:vmbuilder
Diff against target: 43 lines (+6/-6)
1 file modified
VMBuilder/contrib/cli.py (+6/-6)
To merge this branch: bzr merge lp:~barry/vmbuilder/bug-612082
Reviewer Review Type Date Requested Status
Serge Hallyn Approve
Review via email: mp+80615@code.launchpad.net

Description of the change

Fixes bug 612082; printing warning message fails when --part is given a
nonexistent file. Patch given by Daniel Holbert; ported to trunk by Barry
Warsaw.

To post a comment you must log in.
Revision history for this message
Serge Hallyn (serge-hallyn) wrote :

Thanks!

review: Approve

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 2011-05-18 23:07:40 +0000
3+++ VMBuilder/contrib/cli.py 2011-10-27 20:03:24 +0000
4@@ -219,7 +219,7 @@
5 print 'Chroot can be found in %s' % distro.chroot_dir
6 sys.exit(0)
7
8- self.set_disk_layout(hypervisor)
9+ self.set_disk_layout(optparser, hypervisor)
10 hypervisor.install_os()
11
12 os.mkdir(destdir)
13@@ -301,7 +301,7 @@
14 elif opt_str == '--quiet':
15 VMBuilder.set_console_loglevel(logging.CRITICAL)
16
17- def set_disk_layout(self, hypervisor):
18+ def set_disk_layout(self, optparser, hypervisor):
19 default_filesystem = hypervisor.distro.preferred_filesystem()
20 if not self.options.part:
21 rootsize = parse_size(self.options.rootsize)
22@@ -380,8 +380,8 @@
23 filename=tmpfile,
24 mntpnt=elements[0])
25 except IOError, (errno, strerror):
26- self.optparser.error("%s parsing --part option: %s" %
27- (errno, strerror))
28+ optparser.error("%s parsing --part option: %s" %
29+ (errno, strerror))
30 else:
31 try:
32 curdisk = list()
33@@ -403,8 +403,8 @@
34 self.do_disk(hypervisor, curdisk, size, disk_idx)
35
36 except IOError, (errno, strerror):
37- hypervisor.optparser.error("%s parsing --part option: %s" %
38- (errno, strerror))
39+ optparser.error("%s parsing --part option: %s" %
40+ (errno, strerror))
41
42 def do_disk(self, hypervisor, curdisk, size, disk_idx):
43 default_filesystem = hypervisor.distro.preferred_filesystem()

Subscribers

People subscribed via source and target branches