~ubuntu-branches/ubuntu/oneiric/virtinst/oneiric

« back to all changes in this revision

Viewing changes to virtinst/VirtualController.py

  • Committer: Bazaar Package Importer
  • Author(s): Marc Deslauriers
  • Date: 2011-08-08 13:43:26 UTC
  • mfrom: (1.6.4 sid)
  • Revision ID: james.westby@ubuntu.com-20110808134326-9ej41e5x1o1pg2ha
Tags: 0.600.0-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.
* Removed patches:
  - 9002_Lucid.patch: upstream
  - 9004_ubuntu_correct_tree.patch: upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
18
18
# MA 02110-1301 USA.
19
19
 
20
20
import VirtualDevice
21
 
#from virtinst import _virtinst as _
 
21
#from virtinst import _gettext as _
22
22
from XMLBuilderDomain import _xml_property
23
23
 
24
24
class VirtualController(VirtualDevice.VirtualDevice):