mirror of
https://abf.rosa.ru/djam/tuned.git
synced 2025-02-24 06:32:57 +00:00
48 lines
2.3 KiB
Diff
48 lines
2.3 KiB
Diff
diff -Naur tuned-2.8.0/Makefile tuned-2.8.0.tpg/Makefile
|
|
--- tuned-2.8.0/Makefile 2017-04-11 14:05:16.000000000 +0000
|
|
+++ tuned-2.8.0.tpg/Makefile 2017-04-29 21:29:15.256193107 +0000
|
|
@@ -29,7 +29,7 @@
|
|
|
|
DATADIR = /usr/share
|
|
DOCDIR = $(DATADIR)/doc/$(NAME)
|
|
-PYTHON_SITELIB = $(shell python -c 'from distutils.sysconfig import get_python_lib; print get_python_lib();' || echo /usr/lib/python2.7/site-packages)
|
|
+PYTHON_SITELIB = $(shell python -c 'from distutils.sysconfig import get_python_lib; print(get_python_lib());' || echo /usr/lib/python2.7/site-packages)
|
|
TUNED_PROFILESDIR = /usr/lib/tuned
|
|
BASH_COMPLETIONS = $(DATADIR)/bash-completion/completions
|
|
|
|
diff -Naur tuned-2.8.0/tuned/daemon/application.py tuned-2.8.0.tpg/tuned/daemon/application.py
|
|
--- tuned-2.8.0/tuned/daemon/application.py 2017-04-29 21:03:15.138214904 +0000
|
|
+++ tuned-2.8.0.tpg/tuned/daemon/application.py 2017-04-29 21:27:46.470189724 +0000
|
|
@@ -100,7 +100,7 @@
|
|
os.makedirs(dir_name)
|
|
|
|
fd = os.open(self._pid_file, os.O_CREAT|os.O_TRUNC|os.O_WRONLY , 0o644)
|
|
- os.write(fd, "%d" % os.getpid())
|
|
+ os.write(fd, b"%d" % os.getpid())
|
|
os.close(fd)
|
|
except (OSError,IOError) as error:
|
|
log.critical("cannot write the PID to %s: %s" % (self._pid_file, str(error)))
|
|
diff -Naur tuned-2.8.0/tuned/plugins/plugin_sysctl.py tuned-2.8.0.tpg/tuned/plugins/plugin_sysctl.py
|
|
--- tuned-2.8.0/tuned/plugins/plugin_sysctl.py 2017-04-29 21:03:15.139214904 +0000
|
|
+++ tuned-2.8.0.tpg/tuned/plugins/plugin_sysctl.py 2017-04-29 21:31:19.733197851 +0000
|
|
@@ -74,7 +74,7 @@
|
|
def _read_sysctl(self, option):
|
|
retcode, stdout = self._execute_sysctl(["-e", option])
|
|
if retcode == 0:
|
|
- parts = [self._cmd.remove_ws(value) for value in stdout.split("=", 1)]
|
|
+ parts = [self._cmd.remove_ws(str(value)) for value in stdout.split(b"=", 1)]
|
|
if len(parts) == 2:
|
|
option, value = parts
|
|
return value
|
|
diff -Naur tuned-2.8.0/tuned/profiles/variables.py tuned-2.8.0.tpg/tuned/profiles/variables.py
|
|
--- tuned-2.8.0/tuned/profiles/variables.py 2017-04-29 21:03:15.134214904 +0000
|
|
+++ tuned-2.8.0.tpg/tuned/profiles/variables.py 2017-04-29 21:28:40.896191798 +0000
|
|
@@ -1,7 +1,7 @@
|
|
import os
|
|
import re
|
|
import tuned.logs
|
|
-from . import functions.functions as functions
|
|
+from .functions import functions
|
|
import tuned.consts as consts
|
|
from tuned.utils.commands import commands
|
|
from configobj import ConfigObj, ConfigObjError
|