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

[Fabian Groffen]

commit:     7a24c29138df871025e8dfed4f99f655081c898d
Author:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  4 13:20:46 2026 +0000
Commit:     Fabian Groffen <grobian <AT> gentoo <DOT> org>
CommitDate: Sun Jan  4 13:22:22 2026 +0000
URL:        https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=7a24c291

libq/tree: consistently use BUILD_ID in Portage territory

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

 libq/tree.c | 8 ++++----
 libq/tree.h | 2 +-
 q.c         | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libq/tree.c b/libq/tree.c
index f6772bc..1d336d6 100644
--- a/libq/tree.c
+++ b/libq/tree.c
@@ -1819,8 +1819,8 @@ tree_foreach_packages(tree_ctx *ctx, tree_pkg_cb 
callback, void *priv)
                                        }
                                        cat->pkg_ctxs = (tree_pkg_ctx **)atom;  
/* for name */
                                }
-                               if (meta.Q_BUILDID != NULL) {
-                                       atom->BUILDID = atoi(meta.Q_BUILDID);
+                               if (meta.Q_BUILD_ID != NULL) {
+                                       atom->BUILDID = atoi(meta.Q_BUILD_ID);
                                } else if (meta.Q_PATH != NULL) {
                                        depend_atom *patom;
                                        /* dreadful, but Portage apparently 
generates a
@@ -1938,7 +1938,7 @@ tree_foreach_packages(tree_ctx *ctx, tree_pkg_cb 
callback, void *priv)
                match_key(BDEPEND);
                match_key(IDEPEND);
                match_key(PATH);
-               match_key2(BUILD_ID, BUILDID);
+               match_key(BUILD_ID);
 #undef match_key
 #undef match_key2
                }
@@ -2122,7 +2122,7 @@ tree_foreach_gtree(tree_ctx *ctx, tree_pkg_cb callback, 
void *priv)
                                match(USE);
                                match(EPREFIX);
                                match(PATH);
-                               match(BUILDID);
+                               match(BUILD_ID);
                                match(SIZE);
                                match2(_eclasses_, eclasses);
 #undef match

diff --git a/libq/tree.h b/libq/tree.h
index 1c321f5..6ac0e44 100644
--- a/libq/tree.h
+++ b/libq/tree.h
@@ -112,7 +112,7 @@ struct tree_pkg_meta {
        char *Q_USE;
        char *Q_EPREFIX;
        char *Q_PATH;     /* binpkg-multi-instance */
-       char *Q_BUILDID;  /* binpkg-multi-instance */
+       char *Q_BUILD_ID; /* binpkg-multi-instance */
        char *Q_repository;
        char *Q_MD5;
        char *Q_SHA1;

diff --git a/q.c b/q.c
index 9a1acc2..14e7adc 100644
--- a/q.c
+++ b/q.c
@@ -247,7 +247,7 @@ static int q_build_gtree_cache_pkg(tree_pkg_ctx *pkg, void 
*priv)
        q_cache_add_cache_entry(USE);
        q_cache_add_cache_entry(EPREFIX);
        q_cache_add_cache_entry(PATH);
-       q_cache_add_cache_entry(BUILDID);
+       q_cache_add_cache_entry(BUILD_ID);
        if (pkg->cat_ctx->ctx->treetype == TREE_PACKAGES)
                q_cache_add_cache_entry(SIZE);