From 2d0ce6ea888731854667891aaf4c8d000becea15 Mon Sep 17 00:00:00 2001
From: eulerstorage <eulerstorage@huawei.com>
Date: Fri, 10 Jan 2020 10:39:38 +0800
Subject: [PATCH] update iotop

---
 0000-iotop-0.6-noendcurses.patch              | 21 -------------------
 ...hon3.patch => 0000-iotop-0.6-python3.patch |  0
 ...ild.patch => 0001-iotop-python3build.patch |  0
 0003-iotop-0.3.2-batchprintutf8.patch         | 12 -----------
 iotop.spec                                    | 14 ++++++++-----
 5 files changed, 9 insertions(+), 38 deletions(-)
 delete mode 100644 0000-iotop-0.6-noendcurses.patch
 rename 0001-iotop-0.6-python3.patch => 0000-iotop-0.6-python3.patch (100%)
 rename 0002-iotop-python3build.patch => 0001-iotop-python3build.patch (100%)
 delete mode 100644 0003-iotop-0.3.2-batchprintutf8.patch

diff --git a/0000-iotop-0.6-noendcurses.patch b/0000-iotop-0.6-noendcurses.patch
deleted file mode 100644
index b3529d4..0000000
--- a/0000-iotop-0.6-noendcurses.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-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
diff --git a/0001-iotop-0.6-python3.patch b/0000-iotop-0.6-python3.patch
similarity index 100%
rename from 0001-iotop-0.6-python3.patch
rename to 0000-iotop-0.6-python3.patch
diff --git a/0002-iotop-python3build.patch b/0001-iotop-python3build.patch
similarity index 100%
rename from 0002-iotop-python3build.patch
rename to 0001-iotop-python3build.patch
diff --git a/0003-iotop-0.3.2-batchprintutf8.patch b/0003-iotop-0.3.2-batchprintutf8.patch
deleted file mode 100644
index 4e63bc0..0000000
--- a/0003-iotop-0.3.2-batchprintutf8.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -up iotop-0.6/iotop/ui.py.batchprintutf8 iotop-0.6/iotop/ui.py
---- iotop-0.6/iotop/ui.py.batchprintutf8	2016-11-14 11:21:23.690185257 +0100
-+++ iotop-0.6/iotop/ui.py	2016-11-14 11:23:26.511040007 +0100
-@@ -444,7 +444,7 @@ class IOTopUI(object):
-                 if self.options.quiet <= int(first_time):
-                     print(''.join(titles))
-             for l in lines:
--                print(l)
-+                print(l.encode('utf-8'))
-             sys.stdout.flush()
-         else:
-             self.win.erase()
diff --git a/iotop.spec b/iotop.spec
index 88ce274..c31ba5f 100644
--- a/iotop.spec
+++ b/iotop.spec
@@ -1,6 +1,6 @@
 Name:    iotop
 Version: 0.6
-Release: 19
+Release: 20
 Summary: Simple top-like I/O monitor
 License: GPLv2+
 URL:     http://guichaz.free.fr/iotop/
@@ -10,10 +10,8 @@ Source0: http://guichaz.free.fr/iotop/files/%{name}-%{version}.tar.bz2
 BuildArch: noarch
 BuildRequires: python3-devel git
 
-Patch0000: 0000-iotop-0.6-noendcurses.patch
-Patch0001: 0001-iotop-0.6-python3.patch
-Patch0002: 0002-iotop-python3build.patch
-Patch0003: 0003-iotop-0.3.2-batchprintutf8.patch
+Patch0000: 0000-iotop-0.6-python3.patch
+Patch0001: 0001-iotop-python3build.patch
 Patch6000: 6000-iotop-0.6-splitline.patch
 Patch6001: 6001-iotop-0.3.2-ppcprio.patch
 Patch6002: 6002-iotop-0.6-aarch64prio.patch
@@ -54,6 +52,12 @@ This contains man files for the using of iotop
 %{_mandir}/man8/iotop.*
 
 %changelog
+* Fri Jan 10 2020 sunshihao <sunshihao@huawei.com> - 0.6-20
+- Type:enhancemnet
+- ID:NA
+- SUG:NA
+- DESC:update iotop
+
 * Sat Aug 31 2019 Miaohe Lin <linmiaohe@huawei.com> - 0.6-19
 - Type:enhancemnet
 - ID:NA