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 74D5D1382C5 for ; Sat, 16 May 2020 13:06:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 96318E09C4; Sat, 16 May 2020 13:06:31 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (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 7D1BBE09C4 for ; Sat, 16 May 2020 13:06:31 +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 4521634F2C4 for ; Sat, 16 May 2020 13:06:29 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B39F9239 for ; Sat, 16 May 2020 13:06:27 +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: <1589634244.8b113397cda725a0d94782811913a1a03f5e6d46.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: quse.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: 8b113397cda725a0d94782811913a1a03f5e6d46 X-VCS-Branch: master Date: Sat, 16 May 2020 13:06:27 +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: 01add5aa-5342-4a2a-9740-079cd2a4a9b0 X-Archives-Hash: 10ae405f6b935fb501503efb76163fe5 commit: 8b113397cda725a0d94782811913a1a03f5e6d46 Author: Fabian Groffen gentoo org> AuthorDate: Sat May 16 13:04:04 2020 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Sat May 16 13:04:04 2020 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=8b113397 quse: fix interaction of -R with -D ensure descriptions can be retrieved when -R is in effect Signed-off-by: Fabian Groffen gentoo.org> quse.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/quse.c b/quse.c index bcbb620..1e39ce0 100644 --- a/quse.c +++ b/quse.c @@ -141,12 +141,14 @@ quse_search_use_local_desc(int portdirfd, struct quse_state *state) continue; atom->REPO = (char *)state->repo; + atom->SLOT = state->match->SLOT; /* fake match */ if (state->match == NULL || atom_compare(atom, state->match) == EQUAL) { if (state->do_list) { state->retv[i] = xstrdup(q); } else { + atom->SLOT = NULL; /* reset fake slot */ printf("%s[%s%s%s] %s\n", atom_format(state->fmt, atom), MAGENTA, p, NORM, q); @@ -546,6 +548,7 @@ quse_results_cb(tree_pkg_ctx *pkg_ctx, void *priv) .do_describe = false, .do_list = true, .match = atom, + .repo = state->repo, .argc = cnt, .argv = xmalloc(sizeof(char *) * cnt), .retv = xzalloc(sizeof(char *) * cnt),