diff options
| author | Bryan Drewery <bryan@shatow.net> | 2022-11-07 22:57:21 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2022-11-07 23:24:04 +0300 |
| commit | d92b679189a8174359c0c818d247ebf3cc99f875 (patch) | |
| tree | 9ab7ca9ea7142499aeb5c399bb84c1ec0fb45a9c /src/share | |
| parent | f5a009c9399a4a398bd8a345bfdb13db60d4e43e (diff) | |
clean_pool: Remove some dead IGNORED handling.
This was added in 5d6aef4b8f but is not needed due to both
gather_ports_vars() and compute_deps() not processing deps of IGNORED ports.
Handling for those came in da49bc02a8 and 06b67be81c01b9. Primarily
it is due to compute_deps() not relating the IGNORED dependency to
the port that would have been skipped if it were not for it already
being IGNORED.
Add some extra comments about this.
Tweak the bulk-ignore-and-skipped.sh test for this slightly to capture
an ordering requirement, and add comments explaining the expectations.
Diffstat (limited to 'src/share')
| -rwxr-xr-x | src/share/poudriere/common.sh | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 1234a489..23a6bb24 100755 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -5125,13 +5125,6 @@ clean_pool() { # Cleaning queue (pool is cleaned here) pkgqueue_done "${pkgname}" "${clean_rdepends}" | \ while mapfile_read_loop_redir skipped_pkgname; do - # Don't skip listed ports that are also IGNORED. They - # should be accounted as IGNORED. - if [ "${clean_rdepends}" = "ignored" ] && \ - shash_exists pkgname-ignore "${skipped_pkgname}" && \ - pkgname_is_listed "${skipped_pkgname}"; then - continue - fi get_originspec_from_pkgname skipped_originspec "${skipped_pkgname}" originspec_decode "${skipped_originspec}" skipped_origin \ skipped_flavor @@ -6914,10 +6907,13 @@ gather_port_vars_port() { fi # If there are no deps for this port then there's nothing left to do. - if [ -n "${ignore}" ] || [ -z "${deps}" ]; then + if [ -z "${deps}" ]; then + return 0 + fi + # Don't bother fetching dependencies if this port is IGNORED. + if [ -n "${ignore}" ]; then return 0 fi - # Assert some policy before proceeding to process these deps # further. if ! deps_sanity "${originspec}" "${deps}"; then @@ -7102,6 +7098,7 @@ compute_deps_pkg() { shash_remove pkgname-deps "${pkgname}" deps || \ err 1 "compute_deps_pkg failed to find deps for ${COLOR_PORT}${pkgname}${COLOR_RESET}" + # Don't bother relating dependencies of IGNORED ports. if shash_exists pkgname-ignore "${pkgname}"; then msg_debug "compute_deps_pkg: Will not build IGNORED ${COLOR_PORT}${pkgname}${COLOR_RESET} nor queue its deps" return |