diff options
| author |   Fabian Groffen <grobian@gentoo.org> | 2021-12-13 08:46:16 +0100 |
|---|---|---|
| committer | Fabian Groffen <grobian@gentoo.org> | 2021-12-13 08:46:16 +0100 |
| commit | dd51f2543435473120aed9b7f77356d01c354d63 (patch) | |
| tree | 1d995f6e27381316c20332ceb9c1fd466af24d91 | |
| parent | main: turn FEATURES into a set (diff) | |
| download | portage-utils-dd51f2543435473120aed9b7f77356d01c354d63.tar.gz portage-utils-dd51f2543435473120aed9b7f77356d01c354d63.tar.bz2 portage-utils-dd51f2543435473120aed9b7f77356d01c354d63.zip | |
qmerge: use FEATURES as set
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
| -rw-r--r-- | qmerge.c | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -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) { |