fixed configobj class imports

resolves: rhbz#1217327
This commit is contained in:
Jaroslav Škarvada 2015-04-30 16:17:14 +02:00
parent 92e761999b
commit b51a6342b1
2 changed files with 43 additions and 1 deletions

View File

@ -0,0 +1,36 @@
diff --git a/tuned/daemon/application.py b/tuned/daemon/application.py
index e4c9da3..4745adb 100644
--- a/tuned/daemon/application.py
+++ b/tuned/daemon/application.py
@@ -1,6 +1,6 @@
from tuned import storage, units, monitors, plugins, profiles, exports, hardware
from tuned.exceptions import TunedException
-from configobj import ConfigObj
+from configobj import ConfigObj, ConfigObjError
from validate import Validator
import tuned.logs
import controller
diff --git a/tuned/gtk/gui_plugin_loader.py b/tuned/gtk/gui_plugin_loader.py
index bdef93a..a3d7a90 100644
--- a/tuned/gtk/gui_plugin_loader.py
+++ b/tuned/gtk/gui_plugin_loader.py
@@ -136,7 +136,7 @@ class GuiPluginLoader(PluginLoader):
"""
try:
- config = ConfigObj(file_name,
+ config = ConfigObj.ConfigObj(file_name,
configspec=global_config_spec,
raise_errors=True, file_error=True)
except IOError, e:
diff --git a/tuned/profiles/loader.py b/tuned/profiles/loader.py
index 70c1446..8183a04 100644
--- a/tuned/profiles/loader.py
+++ b/tuned/profiles/loader.py
@@ -1,5 +1,5 @@
import tuned.profiles.profile
-from configobj import ConfigObj
+from configobj import ConfigObj, ConfigObjError
import os.path
import collections
import tuned.logs

View File

@ -1,7 +1,7 @@
Summary: A dynamic adaptive system tuning daemon Summary: A dynamic adaptive system tuning daemon
Name: tuned Name: tuned
Version: 2.4.1 Version: 2.4.1
Release: 4%{?dist} Release: 5%{?dist}
License: GPLv2+ License: GPLv2+
Source: https://fedorahosted.org/releases/t/u/tuned/tuned-%{version}.tar.bz2 Source: https://fedorahosted.org/releases/t/u/tuned/tuned-%{version}.tar.bz2
URL: https://fedorahosted.org/tuned/ URL: https://fedorahosted.org/tuned/
@ -15,6 +15,7 @@ Requires: virt-what, python-configobj, ethtool, gawk, kernel-tools, hdparm
Requires: util-linux Requires: util-linux
Patch0: tuned-2.4.1-powertop2tuned-keyerror-fix.patch Patch0: tuned-2.4.1-powertop2tuned-keyerror-fix.patch
Patch1: tuned-2.4.1-bashcomp-fix.patch Patch1: tuned-2.4.1-bashcomp-fix.patch
Patch2: tuned-2.4.1-configobj.patch
%description %description
The tuned package contains a daemon that tunes system settings dynamically. The tuned package contains a daemon that tunes system settings dynamically.
@ -85,6 +86,7 @@ It can be also used to fine tune your system for specific scenarios.
%setup -q %setup -q
%patch0 -p1 %patch0 -p1
%patch1 -p1 %patch1 -p1
%patch2 -p1
%build %build
@ -231,6 +233,10 @@ fi
%{_mandir}/man7/tuned-profiles-compat.7* %{_mandir}/man7/tuned-profiles-compat.7*
%changelog %changelog
* Thu Apr 30 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.1-5
- fixed configobj class imports
resolves: rhbz#1217327
* Thu Apr 2 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.1-4 * Thu Apr 2 2015 Jaroslav Škarvada <jskarvad@redhat.com> - 2.4.1-4
- fixed bash completion - fixed bash completion
resolves: rhbz#1207668 resolves: rhbz#1207668