Revert "bulk checksum: Don't retry fetch on failure if networking disabled."
This reverts commit 20dc590c29e35866065bcbccc60a8d015289488e.
Networking is disabled pre-fetch and post-checksum. So the refetch does
still have networking. It is done in case a cached file does not match
what's in distinfo / rerolled upstream. That is, reverting this fixes
fetching distinfo-expected rerolled distfiles.
What we want is probably to only call `make checksum` and not `make fetch`.
This would cause 1 fetch attempt and would redownload a rerolled
distfile. Rather than risk more regression here though just revert to
what works.
(cherry picked from commit 0198103a348b99189259957ff1edfa5636237c37)
Revert "bulk checksum: Don't retry fetch on failure if networking disabled."
This reverts commit 20dc590c29e35866065bcbccc60a8d015289488e.
Networking is disabled pre-fetch and post-checksum. So the refetch does
still have networking. It is done in case a cached file does not match
what's in distinfo / rerolled upstream. That is, reverting this fixes
fetching distinfo-expected rerolled distfiles.
What we want is probably to only call `make checksum` and not `make fetch`.
This would cause 1 fetch attempt and would redownload a rerolled
distfile. Rather than risk more regression here though just revert to
what works.
options: Improve performance by loading ports_env.
This is normally handled by jail_start() but poudriere-options does not use a
jail. Call setup_ports_env() directly like poudriere-distclean does.
Fixes #1335
(cherry picked from commit b8937a8306487fd94142b31315c6e15f5eb17000)
Conflicts:
src/share/poudriere/options.sh
Fix some fallout from removing DEPENDS_ARGS.
The have_ports_feature() was broken before and did not properly
have FLAVORS set where listed_ports() was used.
(cherry picked from commit af0f63dfcee7dfb2824e421cf3e80c865d4091a7)
options: Improve performance by loading ports_env.
This is normally handled by jail_start() but poudriere-options does not use a
jail. Call setup_ports_env() directly like poudriere-distclean does.
Fixes #1335
testport: do not check the parent directory of a port does not have Mk
The check originates from d72e70f and is not a comprehensive check that
directory is a valid port directory anyway. But it breaks a custom port
tree (built on top of FreeBSD ports) that has some internal Mk
directories.
Fixes: #1319
(cherry picked from commit 8cfc9bfbfe90d8ff00a67d3121bb9a255f8e48f0)
Conflicts:
src/share/poudriere/testport.sh
testport: do not check the parent directory of a port does not have Mk
The check originates from d72e70f and is not a comprehensive check that
directory is a valid port directory anyway. But it breaks a custom port
tree (built on top of FreeBSD ports) that has some internal Mk
directories.
Fixes: #1319
rquery: fix usage to be compatible with all pkg versions
(cherry picked from commit a4691fe33959b31c64ad5a38c1c992050968ff5e)
Conflicts:
src/share/poudriere/common.sh
Issue #1326
