Hello community,
here is the log from the commit of package iotop for openSUSE:Factory checked in at 2013-06-28 11:50:32
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/iotop (Old)
and /work/SRC/openSUSE:Factory/.iotop.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "iotop"
Changes:
--------
--- /work/SRC/openSUSE:Factory/iotop/iotop.changes 2013-03-25 20:31:31.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.iotop.new/iotop.changes 2013-06-28 11:50:34.000000000 +0200
@@ -1,0 +2,9 @@
+Thu Jun 27 12:26:01 CEST 2013 - pth@suse.de
+
+- Update to 0.6:
+ * Clean up the terminal on exit
+ * Stop busy looping on exit in certain conditions
+ * Restored UTF-8 support with python2
+ * Releases are now gpg signed with key "4096R/4D23A27E 2013-05-26"
+
+-------------------------------------------------------------------
Old:
----
iotop-0.5.tar.bz2
New:
----
iotop-0.6.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ iotop.spec ++++++
--- /var/tmp/diff_new_pack.caGRz9/_old 2013-06-28 11:50:34.000000000 +0200
+++ /var/tmp/diff_new_pack.caGRz9/_new 2013-06-28 11:50:34.000000000 +0200
@@ -19,7 +19,7 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c "from distutils.sysconfig import get_python_lib; print(get_python_lib())")}
Name: iotop
-Version: 0.5
+Version: 0.6
Release: 0
Summary: Top Like UI to Show Per-Process I/O Going on
License: GPL-2.0
++++++ iotop-0.5.tar.bz2 -> iotop-0.6.tar.bz2 ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.5/ChangeLog new/iotop-0.6/ChangeLog
--- old/iotop-0.5/ChangeLog 2013-02-03 20:12:50.000000000 +0100
+++ new/iotop-0.6/ChangeLog 2013-05-27 00:47:44.000000000 +0200
@@ -1,3 +1,58 @@
+2013-05-27 Guillaume Chazarain
+
+ * NEWS: Document signature
+
+2013-05-27 Guillaume Chazarain
+
+ * release.sh: GPG sign all released files
+
+2013-05-26 Guillaume Chazarain
+
+ * NEWS, iotop/version.py: Version bump.
+
+2013-05-26 Guillaume Chazarain
+
+ * iotop/ui.py: Clean exit also on SIGTERM otherwise the terminal is
+ unusable.
+
+2013-05-26 Guillaume Chazarain
+
+ * iotop/ui.py: Python3 can print UTF-8 to curses, python2 can't so
+ let's handle both.
+
+2013-05-26 Guillaume Chazarain
+
+ * iotop/ui.py: Cleanly exit on SIGINT otherwise python3 will leave
+ the terminal in an unusable state.
+
+2013-05-26 Guillaume Chazarain
+
+ * .install-rpm.sh: No need to make the RPM install script move bin/
+ to sbin/ now that setup.py installs to sbin/.
+
+2013-05-26 Guillaume Chazarain
+
+ * setup.py: Make setup.py install the iotop script in sbin/ instead
+ of bin/.
+
+2013-05-26 Guillaume Chazarain
+
+ * iotop/ui.py: In some setup closing the xterm window only has the
+ effect of deleting the pty. Then iotop would be busy looping
+ reading on stdin. Instead we should detect the terminal deletion and
+ exit. When this happens iotop receives (0, 25) as an event, which
+ is (stdin, select.POLLIN|select.POLLERR|select.POLLHUP). Also, represent an empty even list as [] instead of 0, this is just
+ cosmetic.
+
+2013-02-04 Paul Wise
+
+ * iotop/data.py, iotop/ioprio.py, iotop/ui.py, iotop/vmstat.py: Fix
+ the FSF address embedded in a few files
+
+2013-02-04 Paul Wise
+
+ * sbin/iotop: Fix python3 compatibility for iotop when installed
+
2013-02-03 Guillaume Chazarain
* README, iotop/data.py: Update python requirements
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.5/NEWS new/iotop-0.6/NEWS
--- old/iotop-0.5/NEWS 2013-02-03 19:50:02.000000000 +0100
+++ new/iotop-0.6/NEWS 2013-05-27 00:44:18.000000000 +0200
@@ -1,3 +1,11 @@
+0.6
+~~~
+o Clean up the terminal on exit
+o Stop busy looping on exit in certain conditions
+o Restored UTF-8 support with python2
+o Fixed install scripts to install to sbin/ instead of bin/
+o Releases are now gpg signed with key "4096R/4D23A27E 2013-05-26"
+
0.5
~~~
o Adapt the display to the maximum pid width
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.5/PKG-INFO new/iotop-0.6/PKG-INFO
--- old/iotop-0.5/PKG-INFO 2013-02-03 20:12:50.000000000 +0100
+++ new/iotop-0.6/PKG-INFO 2013-05-27 00:47:44.000000000 +0200
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: iotop
-Version: 0.5
+Version: 0.6
Summary: Per process I/O bandwidth monitor
Home-page: http://guichaz.free.fr/iotop
Author: Guillaume Chazarain
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.5/iotop/data.py new/iotop-0.6/iotop/data.py
--- old/iotop-0.5/iotop/data.py 2013-02-03 19:50:02.000000000 +0100
+++ new/iotop-0.6/iotop/data.py 2013-05-27 00:44:18.000000000 +0200
@@ -10,7 +10,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# See the COPYING file for license information.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.5/iotop/ioprio.py new/iotop-0.6/iotop/ioprio.py
--- old/iotop-0.5/iotop/ioprio.py 2013-02-03 19:50:02.000000000 +0100
+++ new/iotop-0.6/iotop/ioprio.py 2013-05-27 00:44:18.000000000 +0200
@@ -10,7 +10,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# See the COPYING file for license information.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.5/iotop/ui.py new/iotop-0.6/iotop/ui.py
--- old/iotop-0.5/iotop/ui.py 2013-02-03 19:50:02.000000000 +0100
+++ new/iotop-0.6/iotop/ui.py 2013-05-27 00:44:18.000000000 +0200
@@ -10,7 +10,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# See the COPYING file for license information.
#
@@ -164,9 +164,12 @@
events = poll.poll(self.options.delay_seconds * 1000.0)
except select.error as e:
if e.args and e.args[0] == errno.EINTR:
- events = 0
+ events = []
else:
raise
+ for (fd, event) in events:
+ if event & (select.POLLERR | select.POLLHUP):
+ sys.exit(1)
if not self.options.batch:
self.resize()
if events:
@@ -469,7 +472,14 @@
num_lines = min(len(lines), self.height - 2 - int(bool(status_msg)))
for i in range(num_lines):
try:
- self.win.addstr(i + len(summary) + 1, 0, lines[i])
+ def print_line(line):
+ self.win.addstr(i + len(summary) + 1, 0, line)
+ try:
+ print_line(lines[i])
+ except UnicodeEncodeError:
+ # Python2: 'ascii' codec can't encode character ...
+ # http://bugs.debian.org/708252
+ print_line(lines[i].encode('utf-8'))
except curses.error:
pass
if status_msg:
@@ -480,6 +490,11 @@
def run_iotop_window(win, options):
if options.batch:
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
+ else:
+ def clean_exit(*args, **kwargs):
+ sys.exit(0)
+ signal.signal(signal.SIGINT, clean_exit)
+ signal.signal(signal.SIGTERM, clean_exit)
taskstats_connection = TaskStatsNetlink(options)
process_list = ProcessList(taskstats_connection, options)
ui = IOTopUI(win, process_list, options)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.5/iotop/version.py new/iotop-0.6/iotop/version.py
--- old/iotop-0.5/iotop/version.py 2013-02-03 19:50:02.000000000 +0100
+++ new/iotop-0.6/iotop/version.py 2013-05-27 00:44:18.000000000 +0200
@@ -1 +1 @@
-VERSION = '0.5'
+VERSION = '0.6'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.5/iotop/vmstat.py new/iotop-0.6/iotop/vmstat.py
--- old/iotop-0.5/iotop/vmstat.py 2013-02-03 19:50:02.000000000 +0100
+++ new/iotop-0.6/iotop/vmstat.py 2013-05-27 00:44:18.000000000 +0200
@@ -10,7 +10,7 @@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
# See the COPYING file for license information.
#
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.5/sbin/iotop new/iotop-0.6/sbin/iotop
--- old/iotop-0.5/sbin/iotop 2013-02-03 19:50:02.000000000 +0100
+++ new/iotop-0.6/sbin/iotop 2013-05-27 00:44:18.000000000 +0200
@@ -3,14 +3,15 @@
# Copyright (c) 2007, 2008 Guillaume Chazarain , GPLv2
# See iotop --help for some help
+from __future__ import print_function
import sys
try:
from iotop.ui import main
-except ImportError, e:
- print e
- print 'To run an uninstalled copy of iotop,'
- print 'launch iotop.py in the top directory'
+except ImportError as e:
+ print(e)
+ print('To run an uninstalled copy of iotop,')
+ print('launch iotop.py in the top directory')
else:
try:
main()
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.5/setup.py new/iotop-0.6/setup.py
--- old/iotop-0.5/setup.py 2013-02-03 19:50:02.000000000 +0100
+++ new/iotop-0.6/setup.py 2013-05-27 00:44:18.000000000 +0200
@@ -1,8 +1,16 @@
#!/usr/bin/env python
from distutils.core import setup
+from distutils.command import install as distutils_install
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():
+ if d.get('scripts', '').endswith('/bin'):
+ d['scripts'] = d['scripts'][:-len('/bin')] + '/sbin'
+
setup(name='iotop',
version=VERSION,
description='Per process I/O bandwidth monitor',
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org