← Back to branch summary

~ubuntu-branches/ubuntu/precise/virtinst/precise-updates

« back to all changes in this revision

Viewing changes to virtconv/parsers/virtimage.py

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-02-11 11:47:53 UTC
  • mfrom: (1.6.6 sid)
  • Revision ID: package-import@ubuntu.com-20120211114753-sq9f3xayrma8px2h
Tags: 0.600.1-1ubuntu1
* Merge from debian unstable. Remaining changes:
  - 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.
  - debian/patches/9004_ubuntu_fix_tree_support.patch: Fix tree detection
    for all ISO/HTTP source, to not longer fail with cobbler/koan.
  - debian/patches/9005_ubuntu_precise.patch: Add Ubuntu precise as a
    supported distro.
  - debian/{control,rules,pyversions}: Build using dh_python2, use
    debhelper v8 instead of cdbs; for some reason the package build an
    empty binary package when using dh_python2.
  - debian/control: added acl package to depends.
  - debian/control: added libvirt-bin to recommends

Show diffs side-by-side

added added

removed removed

Lines of Context:
virtconv/parsers/virtimage.py
218
218
            output = f.read()
219
219
            f.close()
220
220
 
221
 
            logging.debug("Importing virt-image XML:\n%s" % output)
 
221
            logging.debug("Importing virt-image XML:\n%s", output)
222
222
            config = ImageParser.parse(output, input_file)
223
223
        except Exception, e:
224
224
            raise ValueError(_("Couldn't import file '%s': %s") %
252
252
            if disk.format in format_mappings:
253
253
                fmt = format_mappings[disk.format]
254
254
            else:
255
 
                raise ValueError(_("Unknown disk format '%s'") % disk.format)
 
255
                raise ValueError(_("Unknown disk format '%s'"), disk.format)
256
256
 
257
257
            devid = (bus, nr_disk)
258
258
            vm.disks[devid] = diskcfg.disk(bus=bus,