| 1 |
commit: e2cb3938176e97b6e41d1873838db35a017cf7d9 |
| 2 |
Author: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun Oct 4 18:43:17 2020 +0000 |
| 4 |
Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Oct 4 18:43:17 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=e2cb3938 |
| 7 |
|
| 8 |
qlop: fix fix for #731122, also make it work without packages specified |
| 9 |
|
| 10 |
Bug: https://bugs.gentoo.org/745798 |
| 11 |
Bug: https://bugs.gentoo.org/731122 |
| 12 |
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org> |
| 13 |
|
| 14 |
qlop.c | 13 +++++++------ |
| 15 |
1 file changed, 7 insertions(+), 6 deletions(-) |
| 16 |
|
| 17 |
diff --git a/qlop.c b/qlop.c |
| 18 |
index a5d8678..24b154c 100644 |
| 19 |
--- a/qlop.c |
| 20 |
+++ b/qlop.c |
| 21 |
@@ -1353,12 +1353,6 @@ static array_t *probe_proc(array_t *atoms) |
| 22 |
xarraydelete_ptr(ret_atoms, j); |
| 23 |
atom_implode(atomr); |
| 24 |
break; |
| 25 |
- } else { |
| 26 |
- /* bug #731122: match running packages without |
| 27 |
- * version */ |
| 28 |
- atomr->PV = NULL; |
| 29 |
- atomr->PVR = NULL; |
| 30 |
- atomr->PR_int = 0; |
| 31 |
} |
| 32 |
} |
| 33 |
atom_implode(atom); |
| 34 |
@@ -1369,7 +1363,14 @@ static array_t *probe_proc(array_t *atoms) |
| 35 |
/* ret_atoms is allocated on the stack, so copy into atoms which is |
| 36 |
* empty at this point */ |
| 37 |
array_for_each(ret_atoms, i, atom) |
| 38 |
+ { |
| 39 |
+ /* bug #731122: match running packages without version */ |
| 40 |
+ atom->PV = NULL; |
| 41 |
+ atom->PVR = NULL; |
| 42 |
+ atom->PR_int = 0; |
| 43 |
+ printf("proc: %s\n", atom_to_string(atom)); |
| 44 |
xarraypush_ptr(atoms, atom); |
| 45 |
+ } |
| 46 |
|
| 47 |
xarrayfree_int(ret_atoms); |
Archives