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

« back to all changes in this revision

Viewing changes to debian/patches/0001-fix-path-to-hvmloader.patch

  • Committer: Package Import Robot
  • Author(s): Marc Deslauriers
  • Date: 2012-07-24 08:52:01 UTC
  • mfrom: (1.6.8 sid)
  • Revision ID: package-import@ubuntu.com-20120724085201-q3h0cbabg4t46gfm
Tags: 0.600.2-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
* Dropped patches:
  - debian/patches/9005_ubuntu_releases.patch: Upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
5
5
Closes: #487682
6
6
---
7
7
 virtinst/Installer.py |    2 +-
8
 
 1 files changed, 1 insertions(+), 1 deletions(-)
 
8
 1 file changed, 1 insertion(+), 1 deletion(-)
9
9
 
10
10
diff --git a/virtinst/Installer.py b/virtinst/Installer.py
11
 
index 2d9907e..1159764 100644
 
11
index 0e1a714..2059972 100644
12
12
--- a/virtinst/Installer.py
13
13
+++ b/virtinst/Installer.py
14
14
@@ -325,7 +325,7 @@ class Installer(XMLBuilderDomain.XMLBuilderDomain):
20
20
 
21
21
         # Use older libvirt 'linux' value for back compat
22
22
         if os_type == "xen" and hvxen: