update to virt-manager-1.2.1

This commit is contained in:
jasper 2015-06-09 06:34:16 +00:00
parent 0a6b78b9a9
commit 222e4d0e73
4 changed files with 4 additions and 55 deletions

View File

@ -1,9 +1,8 @@
# $OpenBSD: Makefile,v 1.12 2015/05/06 21:36:33 jasper Exp $
# $OpenBSD: Makefile,v 1.13 2015/06/09 06:34:16 jasper Exp $
COMMENT= GUI for managing virtual machines through libvirt
DISTNAME= virt-manager-1.2.0
REVISION= 0
DISTNAME= virt-manager-1.2.1
CATEGORIES= sysutils x11
HOMEPAGE= http://virt-manager.org/

View File

@ -1,2 +1,2 @@
SHA256 (virt-manager-1.2.0.tar.gz) = +MpKVipeSneV8/7LXMB7syopjJVcneQ2oZIfg8XopRQ=
SIZE (virt-manager-1.2.0.tar.gz) = 2516620
SHA256 (virt-manager-1.2.1.tar.gz) = dLuoDnLl4bTYTx1bchG4dOnErgCgpEFJ0XIayrOM5r4=
SIZE (virt-manager-1.2.1.tar.gz) = 2524812

View File

@ -1,22 +0,0 @@
$OpenBSD: patch-virtManager_domain_py,v 1.1 2015/05/06 09:59:14 jasper Exp $
From 848123e6c8850bafad28767a165bbbf8dc746a09 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Mon, 4 May 2015 15:50:01 -0400
Subject: domain: Fix memory stats for shutoff VM (bz 1215453)
--- virtManager/domain.py.orig Wed May 6 11:45:18 2015
+++ virtManager/domain.py Wed May 6 11:45:40 2015
@@ -1699,8 +1699,10 @@ class vmmDomain(vmmLibvirtObject):
cpudata = cpudata[0:limit]
return cpudata
def memory_usage_vector_limit(self, limit):
- return self.in_out_vector_limit(self.stats_memory_vector(),
- limit)
+ data = self.stats_memory_vector()
+ if len(data) > limit:
+ data = data[0:limit]
+ return data
def network_traffic_vector_limit(self, limit, ceil=None):
return self.in_out_vector_limit(self.network_traffic_vector(ceil),
limit)

View File

@ -1,28 +0,0 @@
$OpenBSD: patch-virtManager_sshtunnels_py,v 1.2 2015/05/06 21:36:33 jasper Exp $
From ebcb7c064ca5a3afd2ec3a0c8f59328a7f71b009 Mon Sep 17 00:00:00 2001
From: Giuseppe Scrivano <gscrivan@redhat.com>
Date: Wed, 6 May 2015 12:52:40 +0200
Subject: sshtunnels: fix exception when the address is not an IP
--- virtManager/sshtunnels.py.orig Mon May 4 18:26:13 2015
+++ virtManager/sshtunnels.py Wed May 6 23:35:02 2015
@@ -48,10 +48,16 @@ class ConnectionInfo(object):
self._connhost = "127.0.0.1"
def _is_listen_localhost(self, host=None):
- return ipaddr.IPNetwork(host or self.gaddr).is_loopback
+ try:
+ return ipaddr.IPNetwork(host or self.gaddr).is_loopback
+ except:
+ return False
def _is_listen_any(self):
- return ipaddr.IPNetwork(self.gaddr).is_unspecified
+ try:
+ return ipaddr.IPNetwork(self.gaddr).is_unspecified
+ except:
+ return False
def need_tunnel(self):
if not self._is_listen_localhost():