b6b1c2b0f4
iotop: backport some bugfix patches Signed-off-by: Zhiqiang Liu <liuzhiqiang26@huawei.com>
33 lines
1.2 KiB
Diff
33 lines
1.2 KiB
Diff
From 435bbde65bd10aa2ecbd352f46bb7f0abddc2189 Mon Sep 17 00:00:00 2001
|
|
From: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
|
|
Date: Fri, 17 Oct 2014 13:49:31 +0200
|
|
Subject: [PATCH 02/11] Fix build error with Python 3 caused by itervalues() in
|
|
setup.py
|
|
|
|
The itervalues() method is not available in Python 3. As a
|
|
consequence, this patch replaces the call to itervalues() in setup.py
|
|
with a call to values() which works on both Python 2 and Python 3.
|
|
|
|
Signed-off-by: Christophe Vu-Brugier <cvubrugier@fastmail.fm>
|
|
Signed-off-by: Paul Wise <pabs3@bonedaddy.net>
|
|
---
|
|
setup.py | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/setup.py b/setup.py
|
|
index c63a36e..a73423d 100755
|
|
--- a/setup.py
|
|
+++ b/setup.py
|
|
@@ -7,7 +7,7 @@ from iotop.version import VERSION
|
|
# Dirty hack to make setup.py install the iotop script to sbin/ instead of bin/
|
|
# while still honoring the choice of installing into local/ or not.
|
|
if hasattr(distutils_install, 'INSTALL_SCHEMES'):
|
|
- for d in distutils_install.INSTALL_SCHEMES.itervalues():
|
|
+ for d in distutils_install.INSTALL_SCHEMES.values():
|
|
if d.get('scripts', '').endswith('/bin'):
|
|
d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin'
|
|
|
|
--
|
|
1.8.3.1
|
|
|