Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage-utils:master commit in: /
Date: Sun, 02 May 2021 11:25:33
Message-Id: 1619953063.b985ace619b34ff457fa4119e8dabe084695c932.grobian@gentoo
1 commit: b985ace619b34ff457fa4119e8dabe084695c932
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Sun May 2 10:57:43 2021 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Sun May 2 10:57:43 2021 +0000
6 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b985ace6
7
8 qdepends: fix return status when using multiple repos
9
10 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
11
12 qdepends.c | 11 ++++++-----
13 1 file changed, 6 insertions(+), 5 deletions(-)
14
15 diff --git a/qdepends.c b/qdepends.c
16 index 865605e..9e2ea0b 100644
17 --- a/qdepends.c
18 +++ b/qdepends.c
19 @@ -1,5 +1,5 @@
20 /*
21 - * Copyright 2005-2020 Gentoo Authors
22 + * Copyright 2005-2021 Gentoo Authors
23 * Distributed under the terms of the GNU General Public License v2
24 *
25 * Copyright 2005-2010 Ned Ludd - <solar@g.o>
26 @@ -366,6 +366,7 @@ int qdepends_main(int argc, char **argv)
27
28 if (state.qmode & QMODE_INSTALLED || verbose)
29 state.vdb = tree_open_vdb(portroot, portvdb);
30 + ret = 0;
31 if (state.qmode & QMODE_TREE) {
32 char *overlay;
33 size_t n;
34 @@ -376,11 +377,11 @@ int qdepends_main(int argc, char **argv)
35 if (t != NULL) {
36 if (!(state.qmode & QMODE_REVERSE) && array_cnt(atoms) > 0) {
37 array_for_each(atoms, i, atom) {
38 - ret = tree_foreach_pkg_sorted(t,
39 + ret |= tree_foreach_pkg_sorted(t,
40 qdepends_results_cb, &state, atom);
41 }
42 } else {
43 - ret = tree_foreach_pkg_sorted(t,
44 + ret |= tree_foreach_pkg_sorted(t,
45 qdepends_results_cb, &state, NULL);
46 }
47 tree_close(t);
48 @@ -389,11 +390,11 @@ int qdepends_main(int argc, char **argv)
49 } else {
50 if (!(state.qmode & QMODE_REVERSE) && array_cnt(atoms) > 0) {
51 array_for_each(atoms, i, atom) {
52 - ret = tree_foreach_pkg_fast(state.vdb,
53 + ret |= tree_foreach_pkg_fast(state.vdb,
54 qdepends_results_cb, &state, atom);
55 }
56 } else {
57 - ret = tree_foreach_pkg_fast(state.vdb,
58 + ret |= tree_foreach_pkg_fast(state.vdb,
59 qdepends_results_cb, &state, NULL);
60 }
61 }