1 |
commit: e9d4c62de50eb59dcd7c0f6aee4376e839af6e0c |
2 |
Author: Florian Schmaus <flo <AT> geekplace <DOT> eu> |
3 |
AuthorDate: Mon May 3 17:38:32 2021 +0000 |
4 |
Commit: Haelwenn Monnier <contact <AT> hacktivis <DOT> me> |
5 |
CommitDate: Mon May 3 17:39:02 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=e9d4c62d |
7 |
|
8 |
sys-apps/dool: fix KeyError in dool_disk_avgqu.py |
9 |
|
10 |
Closes: https://bugs.gentoo.org/784704 |
11 |
Signed-off-by: Florian Schmaus <flo <AT> geekplace.eu> |
12 |
|
13 |
...91010.ebuild => dool-0.8_pre20191010-r1.ebuild} | 4 ++ |
14 |
sys-apps/dool/dool-9999.ebuild | 4 ++ |
15 |
...y-in-dool_disk_avgqu.py-to-avoid-KeyError.patch | 43 ++++++++++++++++++++++ |
16 |
3 files changed, 51 insertions(+) |
17 |
|
18 |
diff --git a/sys-apps/dool/dool-0.8_pre20191010.ebuild b/sys-apps/dool/dool-0.8_pre20191010-r1.ebuild |
19 |
similarity index 93% |
20 |
rename from sys-apps/dool/dool-0.8_pre20191010.ebuild |
21 |
rename to sys-apps/dool/dool-0.8_pre20191010-r1.ebuild |
22 |
index ae22099fd..92ce074f9 100644 |
23 |
--- a/sys-apps/dool/dool-0.8_pre20191010.ebuild |
24 |
+++ b/sys-apps/dool/dool-0.8_pre20191010-r1.ebuild |
25 |
@@ -31,6 +31,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
26 |
RDEPEND="${PYTHON_DEPS}" |
27 |
DEPEND="${RDEPEND}" |
28 |
|
29 |
+PATCHES=( |
30 |
+ "${FILESDIR}/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch" |
31 |
+) |
32 |
+ |
33 |
src_compile() { |
34 |
: |
35 |
} |
36 |
|
37 |
diff --git a/sys-apps/dool/dool-9999.ebuild b/sys-apps/dool/dool-9999.ebuild |
38 |
index ae22099fd..92ce074f9 100644 |
39 |
--- a/sys-apps/dool/dool-9999.ebuild |
40 |
+++ b/sys-apps/dool/dool-9999.ebuild |
41 |
@@ -31,6 +31,10 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
42 |
RDEPEND="${PYTHON_DEPS}" |
43 |
DEPEND="${RDEPEND}" |
44 |
|
45 |
+PATCHES=( |
46 |
+ "${FILESDIR}/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch" |
47 |
+) |
48 |
+ |
49 |
src_compile() { |
50 |
: |
51 |
} |
52 |
|
53 |
diff --git a/sys-apps/dool/files/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch b/sys-apps/dool/files/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch |
54 |
new file mode 100644 |
55 |
index 000000000..05db73907 |
56 |
--- /dev/null |
57 |
+++ b/sys-apps/dool/files/0001-Key-for-key-in-dool_disk_avgqu.py-to-avoid-KeyError.patch |
58 |
@@ -0,0 +1,43 @@ |
59 |
+From 67b58a3e453d6a7b9c225c1f210e20fe2605908a Mon Sep 17 00:00:00 2001 |
60 |
+From: Florian Schmaus <flo@×××××××××.eu> |
61 |
+Date: Mon, 3 May 2021 19:34:41 +0200 |
62 |
+Subject: [PATCH] Key for key in dool_disk_avgqu.py to avoid KeyError |
63 |
+ |
64 |
+Running "make test" may fail with: |
65 |
+ |
66 |
+Traceback (most recent call last): |
67 |
+ File "./dool", line 2899, in <module> |
68 |
+ main() |
69 |
+ File "./dool", line 2751, in main |
70 |
+ scheduler.run() |
71 |
+ File "/usr/lib/python3.7/sched.py", line 151, in run |
72 |
+ action(*argument, **kwargs) |
73 |
+ File "./dool", line 2847, in perform |
74 |
+ o.extract() |
75 |
+ File "<string>", line 63, in extract |
76 |
+KeyError: 'rq_ticks' |
77 |
+make: *** [Makefile:38: test] Error 1 |
78 |
+ |
79 |
+See https://bugs.gentoo.org/784704 |
80 |
+--- |
81 |
+ plugins/dool_disk_avgqu.py | 4 ++++ |
82 |
+ 1 file changed, 4 insertions(+) |
83 |
+ |
84 |
+diff --git a/plugins/dool_disk_avgqu.py b/plugins/dool_disk_avgqu.py |
85 |
+index 5da8d4666d5c..bc421a82028a 100644 |
86 |
+--- a/plugins/dool_disk_avgqu.py |
87 |
++++ b/plugins/dool_disk_avgqu.py |
88 |
+@@ -60,6 +60,10 @@ class dstat_plugin(dstat): |
89 |
+ ) |
90 |
+ |
91 |
+ for name in self.vars: |
92 |
++ # Avoid KeyError: 'rq_ticks' |
93 |
++ # See https://bugs.gentoo.org/784704 |
94 |
++ if 'rq_ticks' not in self.set1[name] or 'rq_ticks' not in self.set2[name]: |
95 |
++ continue |
96 |
+ self.val[name] = ( ( self.set2[name]['rq_ticks'] - self.set1[name]['rq_ticks'] ) * 1.0 / elapsed / 1000, ) |
97 |
+ |
98 |
+ if step == op.delay: |
99 |
+-- |
100 |
+2.30.2 |
101 |
+ |