From 8f16fda0d3cfe9549cbdecf3f470723fa4c93701 Mon Sep 17 00:00:00 2001 From: Jiri Kastner Date: Thu, 15 Aug 2013 16:12:27 +0200 Subject: [PATCH] fix for bz #997536 --- ...show_thread-call-with-bad-args-count.patch | 26 +++++++++++++++++++ tuna.spec | 4 ++- 2 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 0001-CLI-fix-ps_show_thread-call-with-bad-args-count.patch diff --git a/0001-CLI-fix-ps_show_thread-call-with-bad-args-count.patch b/0001-CLI-fix-ps_show_thread-call-with-bad-args-count.patch new file mode 100644 index 0000000..7c0c6e2 --- /dev/null +++ b/0001-CLI-fix-ps_show_thread-call-with-bad-args-count.patch @@ -0,0 +1,26 @@ +From 9367460e6281f9366d7f3919279f28625a6a6299 Mon Sep 17 00:00:00 2001 +From: Petr Oros +Date: Thu, 15 Aug 2013 11:15:45 +0200 +Subject: [PATCH] CLI: fix ps_show_thread call with bad args count + +Signed-off-by: Petr Oros +--- + tuna-cmd.py | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/tuna-cmd.py b/tuna-cmd.py +index 64e3ad1..5dcc181 100755 +--- a/tuna-cmd.py ++++ b/tuna-cmd.py +@@ -227,7 +227,7 @@ def ps_show_thread(pid, affect_children, ps, + for tid in ps[pid]["threads"].keys(): + ps_show_thread(tid, False, ps[pid]["threads"], + has_ctxt_switch_info, +- sock_inodes, sock_inode_re) ++ sock_inodes, sock_inode_re, cgroups) + + + def ps_show(ps, affect_children, thread_list, cpu_list, +-- +1.8.3.1 + diff --git a/tuna.spec b/tuna.spec index 6064e6c..db0ba74 100644 --- a/tuna.spec +++ b/tuna.spec @@ -3,12 +3,13 @@ Name: tuna Version: 0.11.1 -Release: 1%{?dist} +Release: 2%{?dist} License: GPLv2 Summary: Application tuning GUI & command line utility Group: Applications/System Source: http://userweb.kernel.org/~acme/tuna/%{name}-%{version}.tar.bz2 URL: http://userweb.kernel.org/~acme/tuna/ +Patch0: 0001-CLI-fix-ps_show_thread-call-with-bad-args-count.patch BuildArch: noarch BuildRequires: python-devel, gettext Requires: python-ethtool @@ -45,6 +46,7 @@ priority is changed, be it using tuna or plain chrt & taskset. %prep %setup -q +%patch0 -p1 %build %{__python} setup.py build