Merge lp:~smoser/vmbuilder/lp795358 into lp:vmbuilder

Proposed by Scott Moser
Status: Merged
Merged at revision: 468
Proposed branch: lp:~smoser/vmbuilder/lp795358
Merge into: lp:vmbuilder
Diff against target: 12 lines (+1/-1)
1 file modified
VMBuilder/plugins/libvirt/__init__.py (+1/-1)
To merge this branch: bzr merge lp:~smoser/vmbuilder/lp795358
Reviewer Review Type Date Requested Status
Serge Hallyn Approve
Review via email: mp+65704@code.launchpad.net
To post a comment you must log in.
Revision history for this message
Serge Hallyn (serge-hallyn) wrote :

Thanks, both.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'VMBuilder/plugins/libvirt/__init__.py'
2--- VMBuilder/plugins/libvirt/__init__.py 2010-06-15 19:10:04 +0000
3+++ VMBuilder/plugins/libvirt/__init__.py 2011-06-23 18:03:42 +0000
4@@ -77,7 +77,7 @@
5 else:
6 vmxml = VMBuilder.util.render_template('libvirt', self.context, 'libvirtxml', tmpl_ctxt)
7
8- if hostname in self.all_domains() and not self.vm.overwrite:
9+ if hostname in self.all_domains() and not self.context.overwrite:
10 raise VMBuilderUserError('Domain %s already exists at %s' % (hostname, libvirt_uri))
11 else:
12 self.conn.defineXML(vmxml)

Subscribers

People subscribed via source and target branches