[tuned] fixed crash in cpupower plugin if cpupower is installed

[Jaroslav Škarvada]

commit 542d061091eab6f6b9fb9023a90cc94bd1ece5f4
Author: Jaroslav Škarvada <jskarvad at redhat.com>
Date:   Fri Mar 8 09:23:06 2013 +0100

    fixed crash in cpupower plugin if cpupower is installed

 tuned-2.2.1-cpu-fix-crash-if-cpupower.patch |   32 +++++++++++++++++++++++++++
 tuned.spec                                  |    8 ++++++-
 2 files changed, 39 insertions(+), 1 deletions(-)
---
diff --git a/tuned-2.2.1-cpu-fix-crash-if-cpupower.patch b/tuned-2.2.1-cpu-fix-crash-if-cpupower.patch
new file mode 100644
index 0000000..b3ec996
--- /dev/null
+++ b/tuned-2.2.1-cpu-fix-crash-if-cpupower.patch
@@ -0,0 +1,32 @@
+From 7088da12020efb572f1c1fa52e4c26ab13f53814 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Jaroslav=20=C5=A0karvada?= <jskarvad at redhat.com>
+Date: Mon, 4 Mar 2013 14:32:35 +0100
+Subject: [PATCH] cpu plugin: fixed crash if cpupower is installed
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Signed-off-by: Jaroslav Škarvada <jskarvad at redhat.com>
+---
+ tuned/plugins/plugin_cpu.py | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tuned/plugins/plugin_cpu.py b/tuned/plugins/plugin_cpu.py
+index cf21496..99a979d 100644
+--- a/tuned/plugins/plugin_cpu.py
++++ b/tuned/plugins/plugin_cpu.py
+@@ -124,9 +124,9 @@ class CPULatencyPlugin(base.Plugin):
+ 		governor = None
+ 		if self._has_cpupower:
+ 			cpu_id = device.lstrip("cpu")
+-			retcode, lines = tuned.utils.commands.execute(["cpupower", "-c", cpu_id, "frequency-info", "-p"]).splitlines()
++			retcode, lines = tuned.utils.commands.execute(["cpupower", "-c", cpu_id, "frequency-info", "-p"])
+ 			if retcode == 0:
+-				for line in lines:
++				for line in lines.splitlines():
+ 					if line.startswith("analyzing"):
+ 						continue
+ 					l = line.split()
+-- 
+1.7.11.7
+
diff --git a/tuned.spec b/tuned.spec
index 3364119..36059be 100644
--- a/tuned.spec
+++ b/tuned.spec
@@ -1,10 +1,12 @@
 Summary: A dynamic adaptive system tuning daemon
 Name: tuned
 Version: 2.2.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2+
 Source: https://fedorahosted.org/releases/t/u/tuned/tuned-%{version}.tar.bz2
 URL: https://fedorahosted.org/tuned/
+# backported from upstream
+Patch0: tuned-2.2.1-cpu-fix-crash-if-cpupower.patch
 BuildArch: noarch
 BuildRequires: python, systemd
 Requires(post): systemd, virt-what
@@ -51,6 +53,7 @@ It can be also used to fine tune your system for specific scenarios.
 
 %prep
 %setup -q
+%patch0 -p1
 
 
 %build
@@ -147,6 +150,9 @@ sed -i 's|.*/\([^/]\+\)/[^\.]\+\.conf|\1|' /etc/tuned/active_profile
 %{_prefix}/lib/tuned/spindown-disk
 
 %changelog
+* Mon Mar  4 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 2.2.1-2
+- fixed crash in cpupower plugin if cpupower is installed
+
 * Fri Mar  1 2013 Jaroslav Škarvada <jskarvad at redhat.com> - 2.2.1-1
 - new release:
   - audio plugin: fixed error handling in _get_timeout