← Back to branch summary

~ubuntu-branches/ubuntu/quantal/virtinst/quantal-proposed

« back to all changes in this revision

Viewing changes to virtconv/parsers/ovf.py

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-02-01 15:40:11 UTC
  • mfrom: (1.3.16 experimental)
  • Revision ID: james.westby@ubuntu.com-20110201154011-op0nusgc240xajvb
Tags: 0.500.5-1ubuntu1
* Merge from debian experimental. Remaining changes:
  - debian/patches/9001_Ubuntu.patch:
     + Updated to add maverick and natty to OS list and enable virtio
       for them.
  - debian/patches/9003-fix-path-to-hvmloader-in-testsuite.patch: adjust
    testsuite for 0001-fix-path-to-hvmloader.patch and
    0002-Fix-path-to-pygrub.patch. (refreshed)
  - debian/control: added acl package to depends.
  - Demote virt-viewer to Suggests, as it's in universe.
  - Recommends libvirt-bin
* Removed patches:
  - debian/patches/9002-libvirt_disk_format.patch: Upstream.

Show diffs side-by-side

added added

removed removed

Lines of Context:
virtconv/parsers/ovf.py
208
208
 
209
209
            dev_num = int(get_child_content(device_node, "AddressOnParent"))
210
210
 
211
 
            if bus_id and not disk_buses.has_key(bus_id):
 
211
            if bus_id and bus_id not in disk_buses:
212
212
                raise ValueError(_("Didn't find parent bus for disk '%s'" %
213
213
                                 path))
214
214
 
222
222
 
223
223
                if path.startswith("ovf:/disk/"):
224
224
                    disk_ref = path[len("ovf:/disk/"):]
225
 
                    if not disk_section.has_key(disk_ref):
 
225
                    if disk_ref not in disk_section:
226
226
                        raise ValueError(_("Unknown reference id '%s' "
227
227
                                           "for path %s.") % (path, ref))
228
228
 
238
238
                    # XXX: This means allocate the disk.
239
239
                    pass
240
240
 
241
 
                if not file_refs.has_key(ref):
 
241
                if ref not in file_refs:
242
242
                    raise ValueError(_("Unknown reference id '%s' "
243
243
                                       "for path %s.") % (path, ref))
244
244