mirror of
https://src.fedoraproject.org/rpms/virt-manager.git
synced 2025-07-16 17:14:53 +00:00
38
0009-console-Fix-console_active-logic.patch
Normal file
38
0009-console-Fix-console_active-logic.patch
Normal file
@@ -0,0 +1,38 @@
|
|||||||
|
From a4e1df7fb3c835cb84344a59df82fa33cf1fe1aa Mon Sep 17 00:00:00 2001
|
||||||
|
From: Cole Robinson <crobinso@redhat.com>
|
||||||
|
Date: Sun, 6 Oct 2013 15:30:01 -0400
|
||||||
|
Subject: [PATCH] console: Fix console_active() logic
|
||||||
|
|
||||||
|
(cherry picked from commit 79196cdfcf8f2ac58c87074c326ca3237f84dca6)
|
||||||
|
|
||||||
|
Conflicts:
|
||||||
|
virtManager/console.py
|
||||||
|
---
|
||||||
|
virtManager/console.py | 6 +++---
|
||||||
|
1 file changed, 3 insertions(+), 3 deletions(-)
|
||||||
|
|
||||||
|
diff --git a/virtManager/console.py b/virtManager/console.py
|
||||||
|
index 90db31c..8058af9 100644
|
||||||
|
--- a/virtManager/console.py
|
||||||
|
+++ b/virtManager/console.py
|
||||||
|
@@ -100,9 +100,9 @@ class ConnectionInfo(object):
|
||||||
|
def console_active(self):
|
||||||
|
if self.gsocket:
|
||||||
|
return True
|
||||||
|
- if not self.gport:
|
||||||
|
+ if (self.gport in [None, -1] and self.gtlsport in [None, -1]):
|
||||||
|
return False
|
||||||
|
- return int(self.gport) == -1
|
||||||
|
+ return True
|
||||||
|
|
||||||
|
|
||||||
|
class Tunnel(object):
|
||||||
|
@@ -1129,7 +1129,7 @@ class vmmConsolePages(vmmGObjectUI):
|
||||||
|
self.activate_unavailable_page(msg)
|
||||||
|
return
|
||||||
|
|
||||||
|
- if ginfo.console_active():
|
||||||
|
+ if not ginfo.console_active():
|
||||||
|
self.activate_unavailable_page(
|
||||||
|
_("Graphical console is not yet active for guest"))
|
||||||
|
self.schedule_retry()
|
@@ -21,7 +21,7 @@
|
|||||||
|
|
||||||
|
|
||||||
%define _version 0.10.0
|
%define _version 0.10.0
|
||||||
%define _release 3
|
%define _release 4
|
||||||
|
|
||||||
|
|
||||||
# This macro is used for the continuous automated builds. It just
|
# This macro is used for the continuous automated builds. It just
|
||||||
@@ -53,6 +53,8 @@ Patch0006: 0006-manager-Merge-some-row-creation-drop-unneeded-row-ke.patch
|
|||||||
Patch0007: 0007-manager-Separate-stats-and-state-update-callbacks.patch
|
Patch0007: 0007-manager-Separate-stats-and-state-update-callbacks.patch
|
||||||
# Make cache=default when adding new disk to existing VM (bz #976925)
|
# Make cache=default when adding new disk to existing VM (bz #976925)
|
||||||
Patch0008: 0008-addhw-disk-cache-default-should-be-default-not-none.patch
|
Patch0008: 0008-addhw-disk-cache-default-should-be-default-not-none.patch
|
||||||
|
# Another fix for TLS (bz #904295)
|
||||||
|
Patch0009: 0009-console-Fix-console_active-logic.patch
|
||||||
BuildArch: noarch
|
BuildArch: noarch
|
||||||
|
|
||||||
|
|
||||||
@@ -60,7 +62,7 @@ Requires: virt-manager-common = %{verrel}
|
|||||||
Requires: pygobject3
|
Requires: pygobject3
|
||||||
Requires: gtk3
|
Requires: gtk3
|
||||||
Requires: libvirt-glib >= 0.0.9
|
Requires: libvirt-glib >= 0.0.9
|
||||||
Requires: gnome-python2-gconf
|
Requires: dconf
|
||||||
Requires: libxml2-python
|
Requires: libxml2-python
|
||||||
Requires: vte3
|
Requires: vte3
|
||||||
|
|
||||||
@@ -129,6 +131,8 @@ machine).
|
|||||||
%patch0007 -p1
|
%patch0007 -p1
|
||||||
# Make cache=default when adding new disk to existing VM (bz #976925)
|
# Make cache=default when adding new disk to existing VM (bz #976925)
|
||||||
%patch0008 -p1
|
%patch0008 -p1
|
||||||
|
# Another fix for TLS (bz #904295)
|
||||||
|
%patch0009 -p1
|
||||||
|
|
||||||
%build
|
%build
|
||||||
%if %{qemu_user}
|
%if %{qemu_user}
|
||||||
@@ -239,6 +243,10 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Sun Oct 06 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-4
|
||||||
|
- Another fix for TLS (bz #904295)
|
||||||
|
- Add dep on dconf (bz #1012884)
|
||||||
|
|
||||||
* Wed Sep 25 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-3
|
* Wed Sep 25 2013 Cole Robinson <crobinso@redhat.com> - 0.10.0-3
|
||||||
- Make cache=default when adding new disk to existing VM (bz #976925)
|
- Make cache=default when adding new disk to existing VM (bz #976925)
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user