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 "pth@suse.com"
Changes:
--------
--- /work/SRC/openSUSE:Factory/iotop/iotop.changes 2011-09-23 02:03:38.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.iotop.new/iotop.changes 2011-11-02 11:54:05.000000000 +0100
@@ -1,0 +2,7 @@
+Mon Oct 31 10:10:47 UTC 2011 - pascal.bleser@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.000000000 +0100
+++ /var/tmp/diff_new_pack.uOt8n8/_new 2011-11-02 11:54:06.000000000 +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.000000000 +0200
+++ new/iotop-0.4.4/ChangeLog 2011-10-30 21:56:10.000000000 +0100
@@ -1,3 +1,34 @@
+2011-10-30 Guillaume Chazarain
+
+ * .install-rpm.sh, setup.cfg: Actually install-rpm.sh is still
+ needed.
+
+2011-10-30 Guillaume Chazarain
+
+ * NEWS, iotop/version.py: Version bump
+
+2011-10-15 Guillaume Chazarain
+
+ * 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=commitdif...
+
+2011-09-17 Thomas Guettler
+
+ * iotop/ui.py: Right-justify the header so that numbers stop
+ "bouncing".
+
+2011-08-04 Guillaume Chazarain
+
+ * iotop/ui.py: When printing the time, print it also in the summary
+
+2011-04-10 Guillaume Chazarain
+
+ * 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
* 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/NEWS 2011-03-28 22:34:10.000000000 +0200
+++ new/iotop-0.4.4/NEWS 2011-10-30 21:36:22.000000000 +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-INFO 2011-03-28 22:36:07.000000000 +0200
+++ new/iotop-0.4.4/PKG-INFO 2011-10-30 21:56:10.000000000 +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.000000000 +0200
+++ new/iotop-0.4.4/iotop/data.py 2011-10-30 21:36:22.000000000 +0100
@@ -17,11 +17,9 @@
# Copyright (c) 2007 Guillaume Chazarain
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.000000000 +0200
+++ new/iotop-0.4.4/iotop/genetlink.py 2011-10-30 21:36:22.000000000 +0100
@@ -7,7 +7,8 @@
'''
import struct
-from netlink import *
+from netlink import NLM_F_REQUEST, NLMSG_MIN_TYPE, Message, parse_attributes
+from netlink import NulStrAttr, Connection, NETLINK_GENERIC
CTRL_CMD_UNSPEC = 0
CTRL_CMD_NEWFAMILY = 1
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.3/iotop/ioprio.py new/iotop-0.4.4/iotop/ioprio.py
--- old/iotop-0.4.3/iotop/ioprio.py 2011-03-28 22:34:10.000000000 +0200
+++ new/iotop-0.4.4/iotop/ioprio.py 2011-10-30 21:36:22.000000000 +0100
@@ -20,7 +20,6 @@
import fnmatch
import os
import platform
-import time
# From http://git.kernel.org/?p=utils/util-linux-ng/util-linux-ng.git;a=blob;
# f=configure.ac;h=770eb45ae85d32757fc3cff1d70a7808a627f9f7;hb=HEAD#l354
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.3/iotop/netlink.py new/iotop-0.4.4/iotop/netlink.py
--- old/iotop-0.4.3/iotop/netlink.py 2011-03-28 22:34:10.000000000 +0200
+++ new/iotop-0.4.4/iotop/netlink.py 2011-10-30 21:36:22.000000000 +0100
@@ -6,7 +6,9 @@
GPLv2+; See copying for details.
'''
-import struct, socket
+import os
+import socket
+import struct
try:
# try to use python 2.5's netlink support
@@ -36,7 +38,6 @@
except ImportError:
# or fall back to the ctypes module
import ctypes
- import os
libc = ctypes.CDLL(None)
@@ -220,7 +221,6 @@
msg = Message(msg_type, flags, seq, contents[16:])
msg.pid = pid
if msg.type == NLMSG_ERROR:
- import os
errno = -struct.unpack("i", msg.payload[:4])[0]
if errno != 0:
err = OSError("Netlink error: %s (%d)" % (
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.3/iotop/ui.py new/iotop-0.4.4/iotop/ui.py
--- old/iotop-0.4.3/iotop/ui.py 2011-03-28 22:34:10.000000000 +0200
+++ new/iotop-0.4.4/iotop/ui.py 2011-10-30 21:36:22.000000000 +0100
@@ -22,9 +22,7 @@
import math
import optparse
import os
-import pwd
import select
-import struct
import sys
import time
@@ -400,8 +398,8 @@
def refresh_display(self, first_time, total_read, total_write, duration):
summary = 'Total DISK READ: %s | Total DISK WRITE: %s' % (
- format_bandwidth(self.options, total_read, duration),
- format_bandwidth(self.options, total_write, duration))
+ format_bandwidth(self.options, total_read, duration).rjust(14),
+ format_bandwidth(self.options, total_write, duration).rjust(14))
if self.options.processes:
pid = ' PID'
else:
@@ -413,6 +411,7 @@
titles = [' TIME'] + titles
current_time = time.strftime('%H:%M:%S ')
lines = [current_time + l for l in lines]
+ summary = current_time + summary
if self.options.batch:
if self.options.quiet <= 2:
print summary
@@ -459,10 +458,19 @@
ui.run()
def run_iotop(options):
- if options.batch:
- return run_iotop_window(None, options)
- else:
- return curses.wrapper(run_iotop_window, options)
+ try:
+ if options.batch:
+ return run_iotop_window(None, options)
+ else:
+ return curses.wrapper(run_iotop_window, options)
+ except OSError, e:
+ if e.errno == errno.EPERM:
+ print >> sys.stderr, e
+ print >> sys.stderr, ('iotop requires root or the NET_ADMIN '
+ 'capability.')
+ sys.exit(1)
+ else:
+ raise
#
# Profiling
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.3/iotop/version.py new/iotop-0.4.4/iotop/version.py
--- old/iotop-0.4.3/iotop/version.py 2011-03-28 22:34:10.000000000 +0200
+++ new/iotop-0.4.4/iotop/version.py 2011-10-30 21:36:22.000000000 +0100
@@ -1 +1 @@
-VERSION = '0.4.3'
+VERSION = '0.4.4'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.3/iotop/vmstat.py new/iotop-0.4.4/iotop/vmstat.py
--- old/iotop-0.4.3/iotop/vmstat.py 2011-03-28 22:34:10.000000000 +0200
+++ new/iotop-0.4.4/iotop/vmstat.py 2011-10-30 21:36:22.000000000 +0100
@@ -16,8 +16,6 @@
#
# Copyright (c) 2007 Guillaume Chazarain
-import os
-
class VmStat(object):
def __init__(self):
self.vmstat_file = open('/proc/vmstat')
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/iotop-0.4.3/setup.cfg new/iotop-0.4.4/setup.cfg
--- old/iotop-0.4.3/setup.cfg 2011-03-28 22:34:10.000000000 +0200
+++ new/iotop-0.4.4/setup.cfg 2011-10-30 21:36:22.000000000 +0100
@@ -1,2 +1,3 @@
[bdist_rpm]
doc_files = ChangeLog COPYING NEWS README THANKS
+install_script = .install-rpm.sh
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org