rpms/iotop
5
0
Fork 0
Code Issues Pull Requests Releases Activity

always ignore nocbreak errors, there is way too many false positives (#1035503)

Browse Source
This commit is contained in:
Michal Hlavinka 2015-01-30 18:36:38 +01:00
parent 5033dd8b94
commit c1f6110ae7
2 changed files with 7 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
iotop-0.6-noendcurses.patch
View File

@ -1,36 +1,13 @@
diff -up iotop-0.6/iotop/ui.py.noendcurses iotop-0.6/iotop/ui.py 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.noendcurses 2014-12-03 17:50:38.941430261 +0100
+++ iotop-0.6/iotop/ui.py 2014-12-03 17:51:40.108064465 +0100 +++ iotop-0.6/iotop/ui.py 2014-12-03 17:51:40.108064465 +0100
@@ -488,10 +488,14 @@ class IOTopUI(object):
self.win.refresh()
def run_iotop_window(win, options):
+ global terminating
+ terminating = False
if options.batch:
signal.signal(signal.SIGPIPE, signal.SIG_DFL)
else:
def clean_exit(*args, **kwargs):
+ global terminating
+ terminating = True
sys.exit(0)
signal.signal(signal.SIGINT, clean_exit)
signal.signal(signal.SIGTERM, clean_exit)
@@ -499,6 +503,7 @@ def run_iotop_window(win, options):
process_list = ProcessList(taskstats_connection, options)
ui = IOTopUI(win, process_list, options)
ui.run()
+ terminating = True
def run_iotop(options):
try:
@@ -520,6 +525,17 @@ Please do not file bugs on iotop about t @@ -520,6 +525,17 @@ Please do not file bugs on iotop about t
sys.exit(1) sys.exit(1)
else: else:
raise raise
+ except curses.error as e: + except curses.error as e:
+ stre = str(e) + stre = str(e)
+ if terminating and stre.find('ERR')>=0 and ( + if stre.find('ERR')>=0 and (
+ stre.find('nocbreak()')>=0 or stre.find('endwin()')>=0 + stre.find('nocbreak()')>=0 or stre.find('endwin()')>=0
+ ): + ):
+ pass + pass

9
iotop.spec
View File

@ -1,7 +1,7 @@
%{!?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 Name: iotop
Version: 0.6 Version: 0.6
Release: 4%{?dist} Release: 5%{?dist}
Summary: Top like utility for I/O Summary: Top like utility for I/O
Group: Applications/System Group: Applications/System
@ -49,6 +49,9 @@ rm -rf $RPM_BUILD_ROOT
%{python_sitelib}/* %{python_sitelib}/*
%changelog %changelog
* Fri Jan 30 2015 Michal Hlavinka <mhlavink@redhat.com> - 0.6-5
- always ignore nocbreak errors, there is way too many false positives (#1035503)
* Wed Dec 03 2014 Michal Hlavinka <mhlavink@redhat.com> - 0.6-4 * Wed Dec 03 2014 Michal Hlavinka <mhlavink@redhat.com> - 0.6-4
- ignore curses failures during termination (#1035503) - ignore curses failures during termination (#1035503)
@ -119,8 +122,8 @@ rm -rf $RPM_BUILD_ROOT
* Fri Dec 28 2007 Adel Gadllah <adel.gadllah@gmail.com> 0.1-2 * Fri Dec 28 2007 Adel Gadllah <adel.gadllah@gmail.com> 0.1-2
- Fix traceback on xterm-color RH #400071 - Fix traceback on xterm-color RH #400071
* Sun Nov 3 2007 Adel Gadllah <adel.gadllah@gmail.com> 0.1-1 * Sat Nov 3 2007 Adel Gadllah <adel.gadllah@gmail.com> 0.1-1
- Fix version - Fix version
* Sun Nov 3 2007 Adel Gadllah <adel.gadllah@gmail.com> 20070930-1 * Sat Nov 3 2007 Adel Gadllah <adel.gadllah@gmail.com> 20070930-1
- Initial Build - Initial Build