← Back to branch summary

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

« back to all changes in this revision

Viewing changes to virtinst/__init__.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:
virtinst/__init__.py
53
53
from CloneManager import CloneDesign
54
54
from User import User
55
55
from Clock import Clock
 
56
from CPU import CPU
56
57
from Seclabel import Seclabel
 
58
from XMLBuilderDomain import XMLBuilderDomain
57
59
import util
58
60
import support
59
61
 
66
68
           "ImportInstaller", "ImageInstaller", "CloneDesign",
67
69
           "Storage", "Interface",
68
70
           "User", "util", "support", "VirtualDevice", "Clock", "Seclabel",
 
71
           "CPU",
69
72
           "VirtualHostDevice", "VirtualHostDeviceUSB", "VirtualVideoDevice",
70
73
           "VirtualHostDevicePCI", "VirtualCharDevice", "VirtualInputDevice",
71
74
           "VirtualController", "VirtualWatchdog"]