From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id B47121382C5 for ; Thu, 29 Apr 2021 15:04:07 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BB462E0831; Thu, 29 Apr 2021 15:04:05 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A45ABE0831 for ; Thu, 29 Apr 2021 15:04:05 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5B976340FBD for ; Thu, 29 Apr 2021 15:04:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 6FA14C3 for ; Thu, 29 Apr 2021 15:04:02 +0000 (UTC) From: "Fabian Groffen" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Fabian Groffen" Message-ID: <1619708598.7bbb7d1237d4fc6380c29059c7b0531d2adf0ee4.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: libq/ X-VCS-Repository: proj/portage-utils X-VCS-Files: libq/tree.c X-VCS-Directories: libq/ X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 7bbb7d1237d4fc6380c29059c7b0531d2adf0ee4 X-VCS-Branch: master Date: Thu, 29 Apr 2021 15:04:02 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: b97351c6-421f-473b-aec8-e1e4b24e637e X-Archives-Hash: 5be3f66fecd154dec89ada4c3c7ff1f8 commit: 7bbb7d1237d4fc6380c29059c7b0531d2adf0ee4 Author: Fabian Groffen gentoo org> AuthorDate: Thu Apr 29 15:03:18 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Thu Apr 29 15:03:18 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=7bbb7d12 libq/tree: return all pkgs found in Packages file, whether or not existant Signed-off-by: Fabian Groffen gentoo.org> libq/tree.c | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/libq/tree.c b/libq/tree.c index e692ee9..f66059b 100644 --- a/libq/tree.c +++ b/libq/tree.c @@ -1374,18 +1374,13 @@ tree_foreach_packages(tree_ctx *ctx, tree_pkg_cb callback, void *priv) cat->pkg_ctxs = NULL; tree_close_cat(cat); } - pkg.cat_ctx = cat = tree_open_cat(ctx, atom->CATEGORY); + cat = tree_open_cat(ctx, atom->CATEGORY); if (cat == NULL) { - /* probably dir doesn't exist or something, skip - * this one */ - memset(&meta, 0, sizeof(meta)); - if (len > 0) { /* hop over \n */ - p++; - len--; - } - ctx->pkgs = c; - continue; + /* probably dir doesn't exist or something, + * generate a dummy cat */ + cat = tree_open_cat(ctx, "."); } + pkg.cat_ctx = cat; cat->pkg_ctxs = (tree_pkg_ctx **)atom; /* for name */ } pkgnamelen = snprintf(pkgname, sizeof(pkgname),