[Pkg-libvirt-commits] [virt-manager] 03/08: Rediff patches

[Guido Guenther]

This is an automated email from the git hooks/post-receive script.

agx pushed a commit to annotated tag debian/1%1.4.2-1
in repository virt-manager.

commit 4ce9023d85eef76e0352f867872688cee54b0cc6
Author: Guido Günther <agx at sigxcpu.org>
Date:   Wed Aug 30 18:44:06 2017 +0200

    Rediff patches
---
 debian/patches/Use-usr-bin-python.patch             | 16 ++++++++--------
 debian/patches/virtinst/Fix-patch-to-pygrub.patch   |  4 ++--
 debian/patches/virtinst/fix-path-to-hvmloader.patch | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/patches/Use-usr-bin-python.patch b/debian/patches/Use-usr-bin-python.patch
index cc90aa9..62b89c7 100644
--- a/debian/patches/Use-usr-bin-python.patch
+++ b/debian/patches/Use-usr-bin-python.patch
@@ -14,7 +14,7 @@ so we don't have to worry about picking up the wrong version
  7 files changed, 7 insertions(+), 7 deletions(-)
 
 diff --git a/setup.py b/setup.py
-index 65118ae..778143a 100755
+index 6f4b37b..73f6339 100755
 --- a/setup.py
 +++ b/setup.py
 @@ -1,4 +1,4 @@
@@ -24,7 +24,7 @@ index 65118ae..778143a 100755
  
  import glob
 diff --git a/tests/test_inject.py b/tests/test_inject.py
-index 370584f..f0a5040 100755
+index a9b939c..05926c4 100755
 --- a/tests/test_inject.py
 +++ b/tests/test_inject.py
 @@ -1,4 +1,4 @@
@@ -32,9 +32,9 @@ index 370584f..f0a5040 100755
 +#!/usr/bin/python
  # Copyright (C) 2013, 2014 Red Hat, Inc.
  
- import atexit
+ from __future__ import print_function
 diff --git a/virt-clone b/virt-clone
-index 572977a..fac3d1f 100755
+index 12f0d06..f1a8976 100755
 --- a/virt-clone
 +++ b/virt-clone
 @@ -1,4 +1,4 @@
@@ -44,7 +44,7 @@ index 572977a..fac3d1f 100755
  # Copyright(c) FUJITSU Limited 2007.
  #
 diff --git a/virt-convert b/virt-convert
-index dd964f5..e2f408d 100755
+index c42f2ef..81c25dc 100755
 --- a/virt-convert
 +++ b/virt-convert
 @@ -1,4 +1,4 @@
@@ -54,7 +54,7 @@ index dd964f5..e2f408d 100755
  # Copyright 2008, 2013, 2014  Red Hat, Inc.
  # Joey Boggs <jboggs at redhat.com>
 diff --git a/virt-install b/virt-install
-index f1da100..e66e674 100755
+index 0c7f9fe..6044d47 100755
 --- a/virt-install
 +++ b/virt-install
 @@ -1,4 +1,4 @@
@@ -64,7 +64,7 @@ index f1da100..e66e674 100755
  # Copyright 2005-2014 Red Hat, Inc.
  #
 diff --git a/virt-manager b/virt-manager
-index b3a8f69..0f457af 100755
+index 4c05c1f..aa6ba91 100755
 --- a/virt-manager
 +++ b/virt-manager
 @@ -1,4 +1,4 @@
@@ -74,7 +74,7 @@ index b3a8f69..0f457af 100755
  # Copyright (C) 2006, 2014 Red Hat, Inc.
  # Copyright (C) 2006 Daniel P. Berrange <berrange at redhat.com>
 diff --git a/virt-xml b/virt-xml
-index cfe3796..6ad7779 100755
+index 59d6c4f..66ab815 100755
 --- a/virt-xml
 +++ b/virt-xml
 @@ -1,4 +1,4 @@
diff --git a/debian/patches/virtinst/Fix-patch-to-pygrub.patch b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
index 658f7f3..bde9248 100644
--- a/debian/patches/virtinst/Fix-patch-to-pygrub.patch
+++ b/debian/patches/virtinst/Fix-patch-to-pygrub.patch
@@ -8,10 +8,10 @@ Closes: #685749
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virtinst/guest.py b/virtinst/guest.py
-index 8fad018..fa0aec7 100644
+index cb9c780..53fa206 100644
 --- a/virtinst/guest.py
 +++ b/virtinst/guest.py
-@@ -363,7 +363,7 @@ class Guest(XMLBuilder):
+@@ -365,7 +365,7 @@ class Guest(XMLBuilder):
          if (not install and
              self.os.is_xenpv() and
              not self.os.kernel):
diff --git a/debian/patches/virtinst/fix-path-to-hvmloader.patch b/debian/patches/virtinst/fix-path-to-hvmloader.patch
index ecb6408..4b76d68 100644
--- a/debian/patches/virtinst/fix-path-to-hvmloader.patch
+++ b/debian/patches/virtinst/fix-path-to-hvmloader.patch
@@ -8,15 +8,15 @@ Closes: #685749
  1 file changed, 1 insertion(+), 1 deletion(-)
 
 diff --git a/virtinst/guest.py b/virtinst/guest.py
-index f3e3b09..8fad018 100644
+index 529286f..cb9c780 100644
 --- a/virtinst/guest.py
 +++ b/virtinst/guest.py
-@@ -730,7 +730,7 @@ class Guest(XMLBuilder):
+@@ -812,7 +812,7 @@ class Guest(XMLBuilder):
              self.os.init = self.os.init or "/bin/sh"
  
          if not self.os.loader and self.os.is_hvm() and self.type == "xen":
 -            self.os.loader = "/usr/lib/xen/boot/hvmloader"
 +            self.os.loader = "hvmloader"
-         if self.os.os_type == "xen" and self.type == "xen":
-             # Use older libvirt 'linux' value for back compat
-             self.os.os_type = "linux"
+         if self.os.kernel or self.os.init:
+             self.os.bootorder = []
+ 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-libvirt/virt-manager.git