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

[Fabian Groffen]

commit:     8a5215917d1d1a40d7a127c9218fa1c2166954de
Author:     Joakim Tjernlund <joakim.tjernlund <AT> infinera <DOT> com>
AuthorDate: Tue May 14 16:58:19 2019 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Thu May 16 17:12:31 2019 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=8a521591

qmerge: make qlist_match more sensical about SLOT and REPO matches

make exact match skip : and :: for SLOT resp. REPO when NULL

Signed-off-by: Joakim Tjernlund <joakim.tjernlund <AT> infinera.com>
Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>

 qlist.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/qlist.c b/qlist.c
index 9219108..52ae77d 100644
--- a/qlist.c
+++ b/qlist.c
@@ -258,13 +258,15 @@ qlist_match(
        if (exact) {
                int i;
 
-               snprintf(buf, sizeof(buf), "%s/%s-%s:%s%s%s::%s",
+               snprintf(buf, sizeof(buf), "%s/%s-%s%s%s%s%s%s%s",
                        atom->CATEGORY,
                        atom->PN,
                        atom->PVR,
+                       atom->SLOT != NULL ? ":" : "",
                        atom->SLOT != NULL ? atom->SLOT : "",
                        atom->SUBSLOT != NULL ? "/" : "",
                        atom->SUBSLOT != NULL ? atom->SUBSLOT : "",
+                       atom->REPO != NULL ? "::" : "",
                        atom->REPO != NULL ? atom->REPO : "");
 
                /* exact match: CAT/PN-PVR[:SLOT][::REPO] */