~ubuntu-branches/ubuntu/saucy/virtinst/saucy-proposed

« back to all changes in this revision

Viewing changes to virtconv/parsers/virtimage.py

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2013-05-21 11:39:19 UTC
  • mfrom: (1.6.12 sid)
  • Revision ID: package-import@ubuntu.com-20130521113919-394o7tbg34tjki7b
Tags: 0.600.4-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/0004-Fix-path-to-qemu-dm.patch: fix the path to the
    qemu-dm binary.
  - 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
* debian/patches/9005_ubuntu_releases.patch: Add recent releases, and
  update EoL releases.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#
 
2
# Copyright 2013 Red Hat, Inc.
2
3
# Copyright 2008 Sun Microsystems, Inc.  All rights reserved.
3
4
# Use is subject to license terms.
4
5
#
246
247
                ImageParser.Disk.FORMAT_VMDK: diskcfg.DISK_FORMAT_VMDK,
247
248
                ImageParser.Disk.FORMAT_QCOW: diskcfg.DISK_FORMAT_QCOW,
248
249
                ImageParser.Disk.FORMAT_QCOW2: diskcfg.DISK_FORMAT_QCOW2,
 
250
                ImageParser.Disk.FORMAT_VDI: diskcfg.DISK_FORMAT_VDI,
249
251
            }
250
252
 
251
253
            fmt = None