commit iotop for openSUSE:Factory
Hello community,
here is the log from the commit of package iotop for openSUSE:Factory checked
in at 2018-05-30 12:24:09
Comparing /work/SRC/openSUSE:Factory/iotop (Old)
and /work/SRC/openSUSE:Factory/.iotop.new (New)
Package is "iotop"
Wed May 30 12:24:09 2018 rev:26 rq:612962 version:0.6
Changes:
--- /work/SRC/openSUSE:Factory/iotop/iotop.changes 2018-02-22
15:01:12.972658407 +0100
+++ /work/SRC/openSUSE:Factory/.iotop.new/iotop.changes 2018-05-30
12:29:15.154133385 +0200
@@ -1,0 +2,9 @@
+Tue May 29 15:33:22 UTC 2018 - ldevul...@suse.com
+
+- Add iotop-0.60-fix-proc-status-split.patch: Upstream commit to
+ fix crash when /proc/*/status doesn't have tab character (this
+ can be the case with vserver kernels)
+- Add iotop-0.6-ignore-invalid-lines-in-proc-status.patch: Upstream
+ commit to fix crash when /proc/*/status has invalid lines
+
+---
New:
iotop-0.6-ignore-invalid-lines-in-proc-status.patch
iotop-0.60-fix-proc-status-split.patch
Other differences:
--
++ iotop.spec ++
--- /var/tmp/diff_new_pack.F8TMLE/_old 2018-05-30 12:29:15.946104684 +0200
+++ /var/tmp/diff_new_pack.F8TMLE/_new 2018-05-30 12:29:15.950104539 +0200
@@ -30,6 +30,8 @@
Patch0: iotop-0.6-python3_build.patch
Patch1: iotop-0.6-python3-header.patch
Patch2: iotop-0.6-noendcurses.patch
+Patch3: iotop-0.60-fix-proc-status-split.patch
+Patch4: iotop-0.6-ignore-invalid-lines-in-proc-status.patch
BuildRequires: fdupes
BuildRequires: python3-devel
Requires: python3-curses
@@ -47,6 +49,8 @@
%patch0 -p1
%patch1 -p1
%patch2 -p1
+%patch3 -p1
+%patch4 -p1
%build
python3 setup.py build
++ iotop-0.6-ignore-invalid-lines-in-proc-status.patch ++
>From 0392b205b5c3973a326721c2e9f97f0fa2eefa82 Mon Sep 17 00:00:00 2001
From: Paul Wise
Date: Fri, 25 May 2018 15:13:26 +0800
Subject: [PATCH] Ignore invalid lines in /proc/*/status files
One Ubuntu Linux kernel security fix introduced a blank line.
Some other Linux kernels may have invalid lines in the future.
See-also: https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1772671
Fixes: https://bugs.launchpad.net/ubuntu/+source/iotop/+bug/1772856
Reported-by: Paul Jaros
Reported-in:
Traceback (most recent call last):
File "/usr/sbin/iotop", line 17, in
main()
File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 620, in main
main_loop()
File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 610, in
main_loop = lambda: run_iotop(options)
File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 508, in run_iotop
return curses.wrapper(run_iotop_window, options)
File "/usr/lib/python2.7/curses/wrapper.py", line 43, in wrapper
return func(stdscr, *args, **kwds)
File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 501, in
run_iotop_window
ui.run()
File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 155, in run
self.process_list.duration)
File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 434, in
refresh_display
lines = self.get_data()
File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 415, in get_data
return list(map(format, processes))
File "/usr/lib/python2.7/dist-packages/iotop/ui.py", line 388, in format
cmdline = p.get_cmdline()
File "/usr/lib/python2.7/dist-packages/iotop/data.py", line 292, in
get_cmdline
proc_status = parse_proc_pid_status(self.pid)
File "/usr/lib/python2.7/dist-packages/iotop/data.py", line 196, in
parse_proc_pid_status
key, value = line.split(':\t', 1)
ValueError: need more than 1 value to unpack
---
iotop/data.py | 8 +++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/iotop/data.py b/iotop/data.py
index 115bb8f..e0387f0 100644
--- a/iotop/data.py
+++ b/iotop/data.py
@@ -208,7 +208,13 @@ def parse_proc_pid_status(pid):
result_dict = {}
try:
for line in open('/proc/%d/status' % pid):
-key, value = line.split(':', 1)
+try:
+key, value = line.split(':', 1)
+except ValueError:
+# Ignore lines that are not formatted correctly as
+# some downstream kernels may have weird lines and
+# the needed fields are probably formatted correctly.
+pass
result_dict[key] = value.strip()
except IOError:
pass # No such process
--
2.10.5.GIT
++ iotop-0.60-fix-proc-status-split.patch ++
>From 7814f30a5ed65acd07f284bba991ca557788ee80 Mon Sep 17 00:00:00 2001
From: Paul Wise
Date: Thu, 28 Jul 2016 13:25:54 +0800
Subject: [PATCH] Only split /proc/*/status lines on the : character.
Apparently
commit iotop for openSUSE:Factory
Hello community,
here is the log from the commit of package iotop for openSUSE:Factory checked
in at 2018-02-22 15:01:09
Comparing /work/SRC/openSUSE:Factory/iotop (Old)
and /work/SRC/openSUSE:Factory/.iotop.new (New)
Package is "iotop"
Thu Feb 22 15:01:09 2018 rev:25 rq:578695 version:0.6
Changes:
--- /work/SRC/openSUSE:Factory/iotop/iotop.changes 2015-03-18
13:07:45.0 +0100
+++ /work/SRC/openSUSE:Factory/.iotop.new/iotop.changes 2018-02-22
15:01:12.972658407 +0100
@@ -1,0 +2,16 @@
+Wed Feb 21 11:15:11 UTC 2018 - mvet...@suse.com
+
+- bsc#1081915: Port to python3:
+ * Add iotop-0.6-python3_build.patch: Upstream commit to fix
+python build by replacing itervalues() with values(). ID is
+99c8d7cedce81f17b851954d94bfa73787300599
+ * Add iotop-0.6-python3-header.patch: Replace header to use
+python3
+- Add iotop-0.6-noendcurses.patch: to prevent problems when closing
+ terminal while running iotop (rh#1035503)
+- Run spec-cleaner:
+ * Remove py_requires
+ * Use man macro
+- Drop condition around noarch
+
+---
New:
iotop-0.6-noendcurses.patch
iotop-0.6-python3-header.patch
iotop-0.6-python3_build.patch
Other differences:
--
++ iotop.spec ++
--- /var/tmp/diff_new_pack.JxOprb/_old 2018-02-22 15:01:13.996621569 +0100
+++ /var/tmp/diff_new_pack.JxOprb/_new 2018-02-22 15:01:14.000621425 +0100
@@ -1,7 +1,7 @@
#
# spec file for package iotop
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -21,20 +21,19 @@
Version:0.6
Release:0
Summary:Top Like UI to Show Per-Process I/O Going on
-License:GPL-2.0
+License:GPL-2.0-only
Group: System/Monitoring
Url:http://guichaz.free.fr/iotop/
Source0:http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2
Source1:http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2.asc
Source2:%{name}.keyring
+Patch0: iotop-0.6-python3_build.patch
+Patch1: iotop-0.6-python3-header.patch
+Patch2: iotop-0.6-noendcurses.patch
BuildRequires: fdupes
-BuildRequires: python-devel >= 2.7
-Requires: python-curses
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-%py_requires
-%if 0%{?suse_version} >= 1120
+BuildRequires: python3-devel
+Requires: python3-curses
BuildArch: noarch
-%endif
%description
Linux has always been able to show how much I/O was going on (the bi
@@ -45,19 +44,22 @@
%prep
%setup -q
+%patch0 -p1
+%patch1 -p1
+%patch2 -p1
%build
-python setup.py build
+python3 setup.py build
%install
-python setup.py install --prefix=%{_prefix} --optimize=2 --root=%{buildroot}
+python3 setup.py install --prefix=%{_prefix} --optimize=2 --root=%{buildroot}
%fdupes -s %{buildroot}
%files
-%defattr(-,root,root)
-%doc COPYING NEWS THANKS
+%license COPYING
+%doc NEWS THANKS
%{_sbindir}/iotop
-%{_mandir}/man8/iotop.8.gz
+%{_mandir}/man8/iotop.8%{ext_man}
%{python_sitelib}/*
%changelog
++ iotop-0.6-noendcurses.patch ++
diff -up iotop-0.6/iotop/ui.py.noendcurses iotop-0.6/iotop/ui.py
--- iotop-0.6/iotop/ui.py.noendcurses 2014-12-03 17:50:38.941430261 +0100
+++ iotop-0.6/iotop/ui.py 2014-12-03 17:51:40.108064465 +0100
@@ -520,6 +525,17 @@ Please do not file bugs on iotop about t
sys.exit(1)
else:
raise
+except curses.error as e:
+stre = str(e)
+if stre.find('ERR')>=0 and (
+stre.find('nocbreak()')>=0 or stre.find('endwin()')>=0
+):
+pass
+# endwin and nocbreak can cause error (and raise hard to catch
+# exception) if iotop was running in the terminal and that
+# terminal got closed while iotop was still running
+else:
+raise
#
# Profiling
++ iotop-0.6-python3-header.patch ++
diff -urEbwB iotop-0.6/iotop.py iotop-0.6.new/iotop.py
--- iotop-0.6/iotop.py 2013-05-27 00:44:18.0 +0200
+++ iotop-0.6.new/iotop.py 2018-02-21 12:25:08.136286156 +0100
@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/python3
# iotop: Display I/O usage of processes in a top like UI
# Copyright (c) 2007, 2008 Guillaume Chazarain
# GPL version 2 or later
diff -urEbwB iotop-0.6/sbin/iotop iotop-0.6.new/sbin/iotop
--- iotop-0.6/sbin/iotop2013-05-27 00:44:18.0 +0200
+++ iotop-0.6.new/sbin/iotop2018-02-21 12:25:13.924345875 +0100
@@ -1,4 +1,4 @@
commit iotop for openSUSE:Factory
Hello community,
here is the log from the commit of package iotop for openSUSE:Factory checked
in at 2015-03-18 13:07:39
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-06-28
11:50:34.0 +0200
+++ /work/SRC/openSUSE:Factory/.iotop.new/iotop.changes 2015-03-18
13:07:45.0 +0100
@@ -1,0 +2,9 @@
+Mon Mar 16 20:44:16 UTC 2015 - mplus...@suse.com
+
+- Cleanup spec file with spec-cleaner
+- Remove no longer needed iotop-rpmlintrc
+- Build cleanup
+- Add gpg signature
+- Use fdupes to remove duplicates
+
+---
Old:
iotop-rpmlintrc
New:
iotop-0.6.tar.bz2.asc
iotop.keyring
Other differences:
--
++ iotop.spec ++
--- /var/tmp/diff_new_pack.OicVSm/_old 2015-03-18 13:07:46.0 +0100
+++ /var/tmp/diff_new_pack.OicVSm/_new 2015-03-18 13:07:46.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package iotop
#
-# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -16,24 +16,25 @@
#
-%{!?python_sitelib: %global python_sitelib %(%{__python} -c from
distutils.sysconfig import get_python_lib; print(get_python_lib()))}
-
+%{!?python_sitelib: %global python_sitelib %(python -c from
distutils.sysconfig import get_python_lib; print(get_python_lib()))}
Name: iotop
Version:0.6
Release:0
Summary:Top Like UI to Show Per-Process I/O Going on
License:GPL-2.0
Group: System/Monitoring
-Source: http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2
-Source1:%{name}-rpmlintrc
Url:http://guichaz.free.fr/iotop/
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
+Source0:http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2
+Source1:http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2.asc
+Source2:%{name}.keyring
+BuildRequires: fdupes
BuildRequires: python-devel = 2.7
Requires: python-curses
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
+%py_requires
%if 0%{?suse_version} = 1120
BuildArch: noarch
%endif
-%py_requires
%description
Linux has always been able to show how much I/O was going on (the bi
@@ -46,27 +47,17 @@
%setup -q
%build
-%__python setup.py build
+python setup.py build
%install
-# Copied from: http://trac.edgewall.org/ticket/1141
-# this file is *inserted* into the install section of the generated
-# spec file
-# this is, what dist.py normally does
-%__python setup.py install --prefix=%{_prefix} --root=%{buildroot}
--record=INSTALLED_FILES
-# catch compressed man pages
-%__sed -i -e 's@\(.\+/man/man[[:digit:]]/.\+\.[[:digit:]]\)$@\1*@'
INSTALLED_FILES
-# catch any compiled python files (.pyc, .pyo), but don't list them twice
-%__sed -i -e 's@\(.\+\)\.py$@\1.py*@' \
- -e '/.\+\.pyc$/d' \
- INSTALLED_FILES
-echo %dir %{python_sitelib}/iotop INSTALLED_FILES
-
-%clean
-%{?buildroot:%__rm -rf %{buildroot}}
+python setup.py install --prefix=%{_prefix} --optimize=2 --root=%{buildroot}
+%fdupes -s %{buildroot}
-%files -f INSTALLED_FILES
+%files
%defattr(-,root,root)
%doc COPYING NEWS THANKS
+%{_sbindir}/iotop
+%{_mandir}/man8/iotop.8.gz
+%{python_sitelib}/*
%changelog
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit iotop for openSUSE:Factory
Hello community,
here is the log from the commit of package iotop for openSUSE:Factory checked
in at 2013-03-25 20:30:57
Comparing /work/SRC/openSUSE:Factory/iotop (Old)
and /work/SRC/openSUSE:Factory/.iotop.new (New)
Package is iotop, Maintainer is p...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/iotop/iotop.changes 2011-11-02
11:54:05.0 +0100
+++ /work/SRC/openSUSE:Factory/.iotop.new/iotop.changes 2013-03-25
20:31:31.0 +0100
@@ -1,0 +2,9 @@
+Sun Mar 3 07:44:09 UTC 2013 - zai...@opensuse.org
+
+- Update to version 0.5:
+ + Adapt the display to the maximum pid width.
+ + Include both total and actual disk bandwidth in the summary.
+ + Conversion to Python 3.
+ + Installation to sbin instead of bin.
+
+---
Old:
iotop-0.4.4.tar.bz2
New:
iotop-0.5.tar.bz2
Other differences:
--
++ iotop.spec ++
--- /var/tmp/diff_new_pack.FSeEBM/_old 2013-03-25 20:31:32.0 +0100
+++ /var/tmp/diff_new_pack.FSeEBM/_new 2013-03-25 20:31:32.0 +0100
@@ -1,7 +1,7 @@
#
# spec file for package iotop
#
-# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2013 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -19,16 +19,16 @@
%{!?python_sitelib: %global python_sitelib %(%{__python} -c from
distutils.sysconfig import get_python_lib; print(get_python_lib()))}
Name: iotop
-Version:0.4.4
-Release:1
+Version:0.5
+Release:0
Summary:Top Like UI to Show Per-Process I/O Going on
+License:GPL-2.0
+Group: System/Monitoring
Source: http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2
Source1:%{name}-rpmlintrc
Url:http://guichaz.free.fr/iotop/
-Group: System/Monitoring
-License:GPL-2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: python-devel = 2.5
+BuildRequires: python-devel = 2.7
Requires: python-curses
%if 0%{?suse_version} = 1120
BuildArch: noarch
++ iotop-0.4.4.tar.bz2 - iotop-0.5.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iotop-0.4.4/.gitignore new/iotop-0.5/.gitignore
--- old/iotop-0.4.4/.gitignore 2011-10-30 21:36:22.0 +0100
+++ new/iotop-0.5/.gitignore2013-02-03 19:50:02.0 +0100
@@ -1 +1,2 @@
*.pyc
+/build/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iotop-0.4.4/ChangeLog new/iotop-0.5/ChangeLog
--- old/iotop-0.4.4/ChangeLog 2011-10-30 21:56:10.0 +0100
+++ new/iotop-0.5/ChangeLog 2013-02-03 20:12:50.0 +0100
@@ -1,3 +1,120 @@
+2013-02-03 Guillaume Chazarain guic...@gmail.com
+
+ * README, iotop/data.py: Update python requirements
+
+2013-02-03 Guillaume Chazarain guic...@gmail.com
+
+ * NEWS: Also advertise the move to sbin/ as it's significant
+
+2013-02-03 Guillaume Chazarain guic...@gmail.com
+
+ * .install-rpm.sh: The RPM should also install to sbin.
+
+2013-02-03 Guillaume Chazarain guic...@gmail.com
+
+ * bin/iotop, sbin/iotop: Moved to sbin.
+
+2013-02-03 Guillaume Chazarain guic...@gmail.com
+
+ * .install-rpm.sh, MANIFEST.in: Finish man page renaming
+
+2013-02-03 Guillaume Chazarain guic...@gmail.com
+
+ * NEWS, iotop/version.py: Version bump
+
+2013-02-03 Guillaume Chazarain guic...@gmail.com
+
+ * NEWS, THANKS: Advertise the newly introduced differentiation
+ between total and actual I/O.
+
+2013-02-03 Guillaume Chazarain guic...@gmail.com
+
+ * iotop/ui.py: 80 cols
+
+2012-10-10 Igor Bazhitov ibazhi...@parallels.com
+
+ * iotop.8, iotop/data.py, iotop/ui.py: Add 'Actual' bandwidth stats
+ to summary header 'Total' values in the summary header may look
confusing to users.
+ They represent actual kernel - disk I/O bandwidth, while
+ individual values for processes/threads show process - kernel I/O
+ bandwidth. Rename 'Total' to 'Actual' and add old 'Total' status line
that sums
+ up all individual process/thread bandwidths. Explain the difference
+ between 'Total' and 'Actual' in the manpage.
+
+2012-10-09 Igor Bazhitov ibazhi...@parallels.com
+
+ * README: Update manpage name in README
+
+2012-12-05 Paul Wise pa...@bonedaddy.net
+
+ * iotop/data.py: Fix crash when running under python3. This reverts
cd6ffb5913664844290f44a7ea48533caf8c459e Traceback (most recent call last):
File ./iotop.py, line 12, in
commit iotop for openSUSE:Factory
Hello community,
here is the log from the commit of package iotop for openSUSE:Factory checked
in at 2011-12-06 18:19:33
Comparing /work/SRC/openSUSE:Factory/iotop (Old)
and /work/SRC/openSUSE:Factory/.iotop.new (New)
Package is iotop, Maintainer is p...@suse.com
Changes:
Other differences:
--
++ iotop.spec ++
--- /var/tmp/diff_new_pack.GMMJOU/_old 2011-12-06 18:34:01.0 +0100
+++ /var/tmp/diff_new_pack.GMMJOU/_new 2011-12-06 18:34:01.0 +0100
@@ -26,7 +26,7 @@
Source1:%{name}-rpmlintrc
Url:http://guichaz.free.fr/iotop/
Group: System/Monitoring
-License:GPLv2
+License:GPL-2.0
BuildRoot: %{_tmppath}/%{name}-%{version}-build
BuildRequires: python-devel = 2.5
Requires: python-curses
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
commit iotop for openSUSE:Factory
Hello community,
here is the log from the commit of package iotop for openSUSE:Factory checked
in at 2011-11-02 11:54:03
Comparing /work/SRC/openSUSE:Factory/iotop (Old)
and /work/SRC/openSUSE:Factory/.iotop.new (New)
Package is iotop, Maintainer is p...@suse.com
Changes:
--- /work/SRC/openSUSE:Factory/iotop/iotop.changes 2011-09-23
02:03:38.0 +0200
+++ /work/SRC/openSUSE:Factory/.iotop.new/iotop.changes 2011-11-02
11:54:05.0 +0100
@@ -1,0 +2,7 @@
+Mon Oct 31 10:10:47 UTC 2011 - pascal.ble...@opensuse.org
+
+- update to 0.4.4:
+ * cosmetic fixes, including a better error message when missing root
+credentials
+
+---
Old:
iotop-0.4.3.tar.bz2
New:
iotop-0.4.4.tar.bz2
Other differences:
--
++ iotop.spec ++
--- /var/tmp/diff_new_pack.uOt8n8/_old 2011-11-02 11:54:06.0 +0100
+++ /var/tmp/diff_new_pack.uOt8n8/_new 2011-11-02 11:54:06.0 +0100
@@ -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.4.3
+Version:0.4.4
Release:1
Summary:Top Like UI to Show Per-Process I/O Going on
Source: http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2
++ iotop-0.4.3.tar.bz2 - iotop-0.4.4.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iotop-0.4.3/ChangeLog new/iotop-0.4.4/ChangeLog
--- old/iotop-0.4.3/ChangeLog 2011-03-28 22:36:07.0 +0200
+++ new/iotop-0.4.4/ChangeLog 2011-10-30 21:56:10.0 +0100
@@ -1,3 +1,34 @@
+2011-10-30 Guillaume Chazarain guic...@gmail.com
+
+ * .install-rpm.sh, setup.cfg: Actually install-rpm.sh is still
+ needed.
+
+2011-10-30 Guillaume Chazarain guic...@gmail.com
+
+ * NEWS, iotop/version.py: Version bump
+
+2011-10-15 Guillaume Chazarain guic...@gmail.com
+
+ * iotop/ui.py: Explain that iotop now requires root.
+ https://lkml.org/lkml/2011/10/1/170
+
+
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=1a51410abe7d0ee4b1d112780f46df87d3621043
+
+2011-09-17 Thomas Guettler tguett...@tbz-pariv.de
+
+ * iotop/ui.py: Right-justify the header so that numbers stop
+ bouncing.
+
+2011-08-04 Guillaume Chazarain guic...@gmail.com
+
+ * iotop/ui.py: When printing the time, print it also in the summary
+
+2011-04-10 Guillaume Chazarain guic...@gmail.com
+
+ * iotop/data.py, iotop/genetlink.py, iotop/ioprio.py,
+ iotop/netlink.py, iotop/ui.py, iotop/vmstat.py: Address some
+ pyflakes and pychecker warnings
+
2011-03-28 Guillaume Chazarain guic...@gmail.com
* NEWS, iotop/version.py: Version bump
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iotop-0.4.3/NEWS new/iotop-0.4.4/NEWS
--- old/iotop-0.4.3/NEWS2011-03-28 22:34:10.0 +0200
+++ new/iotop-0.4.4/NEWS2011-10-30 21:36:22.0 +0100
@@ -1,3 +1,8 @@
+0.4.4
+~
+o Cosmetic fixes, including a better error message when missing root
+credentials
+
0.4.3
~
o Fixed netlink message parsing to accept alignement padding
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iotop-0.4.3/PKG-INFO new/iotop-0.4.4/PKG-INFO
--- old/iotop-0.4.3/PKG-INFO2011-03-28 22:36:07.0 +0200
+++ new/iotop-0.4.4/PKG-INFO2011-10-30 21:56:10.0 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.0
Name: iotop
-Version: 0.4.3
+Version: 0.4.4
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.4.3/iotop/data.py
new/iotop-0.4.4/iotop/data.py
--- old/iotop-0.4.3/iotop/data.py 2011-03-28 22:34:10.0 +0200
+++ new/iotop-0.4.4/iotop/data.py 2011-10-30 21:36:22.0 +0100
@@ -17,11 +17,9 @@
# Copyright (c) 2007 Guillaume Chazarain guic...@gmail.com
import errno
-import glob
import os
import pprint
import pwd
-import socket
import stat
import struct
import sys
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iotop-0.4.3/iotop/genetlink.py
new/iotop-0.4.4/iotop/genetlink.py
--- old/iotop-0.4.3/iotop/genetlink.py 2011-03-28 22:34:10.0 +0200
+++ new/iotop-0.4.4/iotop/genetlink.py 2011-10-30 21:36:22.0 +0100
@@ -7,7 +7,8 @@
'''
import struct
-from netlink import *
+from netlink import NLM_F_REQUEST, NLMSG_MIN_TYPE, Message, parse_attributes
commit iotop for openSUSE:Factory
Hello community,
here is the log from the commit of package iotop for openSUSE:Factory
checked in at Thu Mar 31 15:56:49 CEST 2011.
--- iotop/iotop.changes 2010-09-07 12:21:38.0 +0200
+++ iotop/iotop.changes 2011-03-30 10:22:41.0 +0200
@@ -1,0 +2,21 @@
+Wed Mar 30 07:42:46 UTC 2011 - sasc...@suse.de
+
+- Remove authors from %%description
+- Change python ./setup.py calls to python setup.py
+
+---
+Mon Mar 28 23:04:21 UTC 2011 - pascal.ble...@opensuse.org
+
+- update to 0.4.3:
+ * the netlink message parsing code was fixed to accept alignment padding
+ * UTF-8 output is now forced even if the locale is misconfigured
+ * the semantic of the 'a' key was changed to show stats since iotop was
+started
+
+- changes from 0.4.2:
+ * workaround for an ncurses bug where UTF-8 strings are misprinted
+ * ioprio support for the armel and hppa architectures was added
+ * a possible incompatibility with Linux 2.6.37 on 64-bit systems was fixed
+ * iotop does not crash anymore when the locale is incorrectly configured
+
+---
calling whatdependson for head-i586
Old:
iotop-0.4.1.tar.bz2
iotop-pid_alignment.patch
New:
iotop-0.4.3.tar.bz2
Other differences:
--
++ iotop.spec ++
--- /var/tmp/diff_new_pack.sXSp8h/_old 2011-03-31 15:56:09.0 +0200
+++ /var/tmp/diff_new_pack.sXSp8h/_new 2011-03-31 15:56:09.0 +0200
@@ -1,7 +1,7 @@
#
-# spec file for package iotop (Version 0.4.1)
+# spec file for package iotop
#
-# Copyright (c) 2010 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2011 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
# All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed
@@ -15,25 +15,25 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
+%{!?python_sitelib: %global python_sitelib %(%{__python} -c from
distutils.sysconfig import get_python_lib; print(get_python_lib()))}
Name: iotop
-BuildRequires: python-devel = 2.5
+Version:0.4.3
+Release:1
Summary:Top Like UI to Show Per-Process I/O Going on
-Version:0.4.1
-Release:2
-Source: %{name}-%{version}.tar.bz2
+Source: http://guichaz.free.fr/iotop/files/iotop-%{version}.tar.bz2
Source1:%{name}-rpmlintrc
-#Added 2010.09.06 Will be unnecessary with next major version.
-Patch0: iotop-pid_alignment.patch
-License:GPLv2
-Group: System/Monitoring
Url:http://guichaz.free.fr/iotop/
+Group: System/Monitoring
+License:GPLv2
BuildRoot: %{_tmppath}/%{name}-%{version}-build
+BuildRequires: python-devel = 2.5
Requires: python-curses
+%if 0%{?suse_version} = 1120
BuildArch: noarch
-%{py_requires}
+%endif
+%py_requires
%description
Linux has always been able to show how much I/O was going on (the bi
@@ -42,39 +42,28 @@
Iotop is a Python program with a UI similar to top to show on behalf of
which process is the I/O going on.
-
-
-Authors:
-
-Guillaume Chazarain guic...@yahoo.fr
-
%prep
%setup -q
-%patch0 -p1
%build
-python setup.py build
+%__python setup.py build
%install
-#! /bin/sh
-#
# Copied from: http://trac.edgewall.org/ticket/1141
-#
# this file is *inserted* into the install section of the generated
# spec file
-#
# this is, what dist.py normally does
-./setup.py install --prefix=/usr --root=%{buildroot} --record=INSTALLED_FILES
+%__python setup.py install --prefix=%{_prefix} --root=%{buildroot}
--record=INSTALLED_FILES
# catch compressed man pages
-sed -i -e 's@\(.\+/man/man[[:digit:]]/.\+\.[[:digit:]]\)$@\1*@'
INSTALLED_FILES
+%__sed -i -e 's@\(.\+/man/man[[:digit:]]/.\+\.[[:digit:]]\)$@\1*@'
INSTALLED_FILES
# catch any compiled python files (.pyc, .pyo), but don't list them twice
-sed -i -e 's@\(.\+\)\.py$@\1.py*@' \
+%__sed -i -e 's@\(.\+\)\.py$@\1.py*@' \
-e '/.\+\.pyc$/d' \
INSTALLED_FILES
echo %dir %{python_sitelib}/iotop INSTALLED_FILES
%clean
-rm -rf %{buildroot}
+%{?buildroot:%__rm -rf %{buildroot}}
%files -f INSTALLED_FILES
%defattr(-,root,root)
++ iotop-0.4.1.tar.bz2 - iotop-0.4.3.tar.bz2 ++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/iotop-0.4.1/ChangeLog new/iotop-0.4.3/ChangeLog
--- old/iotop-0.4.1/ChangeLog 2010-06-27 18:08:25.0 +0200
+++ new/iotop-0.4.3/ChangeLog 2011-03-28 22:36:07.0 +0200
@@ -1,3 +1,83 @@
+2011-03-28 Guillaume Chazarain guic...@gmail.com
+
+ * NEWS, iotop/version.py: Version bump
+
+2011-03-14 Guillaume Chazarain guic...@gmail.com
+
+ * iotop/ui.py: Show stats since iotop started, not
