diff options
| author | Bryan Drewery <bryan@shatow.net> | 2021-10-26 05:58:02 +0300 |
|---|---|---|
| committer | Bryan Drewery <bryan@shatow.net> | 2021-10-26 05:59:54 +0300 |
| commit | 8d5a12b08c9240261c3f797959d210037206966e (patch) | |
| tree | 38a4ace8a3844e924e6e1fa593a42b905b75c971 /src | |
| parent | 258661c01f64a76461191ccbbb477aa44693f383 (diff) | |
bulk: Fetch before deleting packages for missing bootstrap
Packages are deleted if there is no bootstrap because we cannot read
them in delete_old_pkgs() and sanity_check_pkgs(). But we may have
fetched one that can work during download_from_repo().
This effectively reverts c25726ffc8033
Diffstat (limited to 'src')
| -rw-r--r-- | src/share/poudriere/common.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/share/poudriere/common.sh b/src/share/poudriere/common.sh index 07aa0fc8..5654273b 100644 --- a/src/share/poudriere/common.sh +++ b/src/share/poudriere/common.sh @@ -7867,9 +7867,6 @@ prepare_ports() { xargs -0 rm -rf unlink "${delete_pkg_list}" || : fi - if ! ensure_pkg_installed; then - delete_all_pkgs "pkg package missing" - fi # If the build is being resumed then packages already # built/failed/skipped/ignored should not be rebuilt. @@ -7899,6 +7896,9 @@ prepare_ports() { trim_ignored fi download_from_repo + if ! ensure_pkg_installed; then + delete_all_pkgs "pkg bootstrap missing: unable to inspect existing packages" + fi bset status "sanity:" fi |