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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 99795158086 for ; Mon, 13 Dec 2021 08:39:48 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E3D972BC045; Mon, 13 Dec 2021 08:39:44 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CEF832BC045 for ; Mon, 13 Dec 2021 08:39:44 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A556634353E for ; Mon, 13 Dec 2021 08:39:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 4F673244 for ; Mon, 13 Dec 2021 08:39:40 +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: <1639381576.dd51f2543435473120aed9b7f77356d01c354d63.grobian@gentoo> Subject: [gentoo-commits] proj/portage-utils:master commit in: / X-VCS-Repository: proj/portage-utils X-VCS-Files: qmerge.c X-VCS-Directories: / X-VCS-Committer: grobian X-VCS-Committer-Name: Fabian Groffen X-VCS-Revision: dd51f2543435473120aed9b7f77356d01c354d63 X-VCS-Branch: master Date: Mon, 13 Dec 2021 08:39:40 +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: ee33354b-196a-4f96-b946-e289ef82f6ac X-Archives-Hash: 5135f04567bf785bcc66a8cfe1a8e7f2 commit: dd51f2543435473120aed9b7f77356d01c354d63 Author: Fabian Groffen gentoo org> AuthorDate: Mon Dec 13 07:46:16 2021 +0000 Commit: Fabian Groffen gentoo org> CommitDate: Mon Dec 13 07:46:16 2021 +0000 URL: https://gitweb.gentoo.org/proj/portage-utils.git/commit/?id=dd51f254 qmerge: use FEATURES as set Signed-off-by: Fabian Groffen gentoo.org> qmerge.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/qmerge.c b/qmerge.c index 6defd5b..091b6e1 100644 --- a/qmerge.c +++ b/qmerge.c @@ -1403,13 +1403,13 @@ pkg_merge(int level, const depend_atom *qatom, const tree_match_ctx *mpkg) /* rely on INSTALL_MASK code to remove optional dirs */ maskp = snprintf(imask, masklen, "%s ", install_mask); - if (strstr(features, "noinfo") != NULL) + if (contains_set("noinfo", features)) maskp += snprintf(imask + maskp, masklen - maskp, "/usr/share/info "); - if (strstr(features, "noman" ) != NULL) + if (contains_set("noman", features)) maskp += snprintf(imask + maskp, masklen - maskp, "/usr/share/man "); - if (strstr(features, "nodoc" ) != NULL) + if (contains_set("nodoc", features)) maskp += snprintf(imask + maskp, masklen - maskp, "/usr/share/doc "); @@ -1584,7 +1584,7 @@ pkg_unmerge(tree_pkg_ctx *pkg_ctx, depend_atom *rpkg, set *keep, eprefix_len = strlen(eprefix); unmerge_config_protected = - strstr(features, "config-protect-if-modified") != NULL; + contains_set("config-protect-if-modified", features); /* get a handle on the things to clean up */ buf = tree_pkg_meta_get(pkg_ctx, CONTENTS); @@ -2059,7 +2059,7 @@ int qmerge_main(int argc, char **argv) if (!install && !uninstall) install = 1; - qmerge_strict = (strstr("strict", features) == 0) ? 1 : 0; + qmerge_strict = contains_set("strict", features) ? 1 : 0; /* Short circut this. */ if (install && !pretend) {