From 678131959b34c99b204e3a309d496c9f51f312ec Mon Sep 17 00:00:00 2001
From: Brent Baude <bbaude(a)redhat.com>
Date: Mon, 30 Nov 2015 16:48:58 -0600
Subject: psutil network_io deprecation
---
kimchi-1.5.1-psutil_network.patch | 15 +++++++++++++++
kimchi.spec | 4 +++-
2 files changed, 18 insertions(+), 1 deletion(-)
create mode 100644 kimchi-1.5.1-psutil_network.patch
diff --git a/kimchi-1.5.1-psutil_network.patch b/kimchi-1.5.1-psutil_network.patch
new file mode 100644
index 0000000..08c17bf
--- /dev/null
+++ b/kimchi-1.5.1-psutil_network.patch
@@ -0,0 +1,15 @@
+--- kimchi-1.5.1/src/kimchi/model/host.py.orig 2015-11-30 16:46:54.063373808 -0600
++++ kimchi-1.5.1/src/kimchi/model/host.py 2015-11-30 16:47:13.322972421 -0600
+@@ -248,8 +248,10 @@
+ net_sent_bytes = self.host_stats['net_sent_bytes']
+ prev_recv_bytes = net_recv_bytes[-1] if net_recv_bytes else 0
+ prev_sent_bytes = net_sent_bytes[-1] if net_sent_bytes else 0
+-
+- net_ios = psutil.network_io_counters(True)
++ try:
++ net_ios = psutil.network_io_counters(True)
++ except:
++ net_ios = psutil.network_io_counters(True)
+ recv_bytes = 0
+ sent_bytes = 0
+ for key in set(netinfo.nics() +
diff --git a/kimchi.spec b/kimchi.spec
index bc61f46..88a22df 100644
--- a/kimchi.spec
+++ b/kimchi.spec
@@ -18,7 +18,8 @@ Patch1: kimchi-1.5.1-kbd_type.patch
Patch2: kimchi-1.5.1-remove-cert-gen.patch
Patch3: kimchi-1.5.1-nofailontemplate.patch
Patch4: kimchi-1.5.1-psutil_cpu.patch
-patch5: kimchi-1.5.1-psutil_memory.patch
+Patch5: kimchi-1.5.1-psutil_memory.patch
+Patch6: kimchi-1.5.1-psutil_network.patch
Requires: qemu-kvm
Requires: gettext-devel
@@ -71,6 +72,7 @@ Web server application to manage KVM/Qemu virtual machines
%patch3 -p1
%patch4 -p0
%patch5 -p1
+%patch6 -p1
%build
autoreconf -vfi
%configure
--
cgit v0.11.2
http://pkgs.fedoraproject.org/cgit/kimchi.git/commit/?h=master&id=678...