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

[Fabian Groffen]

commit:     a3d734f7c93a67015f1d48c19ab87732ce30134b
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 24 19:37:53 2026 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sat Jan 24 19:37:53 2026 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=a3d734f7

qmerge: fix gpkg detection (wrong file name)

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

 qmerge.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/qmerge.c b/qmerge.c
index 04ff339..1a97255 100644
--- a/qmerge.c
+++ b/qmerge.c
@@ -1213,9 +1213,9 @@ pkg_merge(int level, const depend_atom *qatom, 
tree_pkg_ctx *mpkg)
 
        p = tree_pkg_get_path(mpkg);
        i = (int)strlen(p);
-       if (i > sizeof(".tar.gpkg") - 1 &&
-               memcmp(&p[i - (sizeof(".tar.gpkg") - 1)],
-                          ".tar.gpkg", sizeof(".tar.gpkg") - 1) == 0)
+       if (i > sizeof(".gpkg.tar") - 1 &&
+               memcmp(&p[i - (sizeof(".gpkg.tar") - 1)],
+                          ".gpkg.tar", sizeof(".gpkg.tar") - 1) == 0)
        {
 #ifdef ENABLE_GPKG
                /* unpack the whole thing to temp, dropping the pkg name dir, so
@@ -1978,7 +1978,7 @@ pkg_verify_checksums(
                mlen = 0;
        if (flen != (size_t)mlen) {
                warn("SIZE: [%sERR%s] %zu != %s for %s from %s\n",
-                        RED, NORM, flen, p, atom_to_string(patom), path);
+                        RED, NORM, flen, p == NULL ? "?" : p, 
atom_to_string(patom), path);
                ret++;
        }
        else if (display)