[gentoo-commits] proj/portage-utils:master commit in: /

[Fabian Groffen]

commit:     b5f3c8c0e052faf2971ebc161545abd84af64486
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  9 09:22:48 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jun  9 09:22:48 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=b5f3c8c0

qfile: fix atom_compare invocation and input

Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 qfile.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/qfile.c b/qfile.c
index 421c850..1480789 100644
--- a/qfile.c
+++ b/qfile.c
@@ -92,15 +92,16 @@ static int qfile_cb(tree_pkg_ctx *pkg_ctx, void *priv)
        int found = 0;
 
        /* If exclude_pkg is not NULL, check it.  We are looking for files
-        * collisions, and must exclude one package.
-        */
+        * collisions, and must exclude one package. */
        if (state->exclude_pkg) {
                /* see if CATEGORY matches */
                if (state->exclude_atom->CATEGORY &&
                    strcmp(state->exclude_atom->CATEGORY, catname))
                        goto dont_skip_pkg;
-               atom = tree_get_atom(pkg_ctx, false);
-               if (atom_compare(state->exclude_atom, atom) != EQUAL)
+               atom = tree_get_atom(pkg_ctx,
+                               state->exclude_atom->SLOT != NULL ||
+                               state->exclude_atom->REPO != NULL);
+               if (atom_compare(atom, state->exclude_atom) != EQUAL)
                        goto dont_skip_pkg;
                /* "(CAT/)?(PN|PF)" matches, and no SLOT specified */
                if (state->exclude_slot == NULL)