BSD Commit Log Search

Merge pull request #1313 from delphij/logclean-1157

logclean: Fix empty build log directory removal with multiple jails

logclean: Fix empty build log directory removal with multiple jails

When multiple jails are configured, the "Removing empty build log
directories" step fails because the script incorrectly processes the
space-separated MASTERNAMES_LOCKED list.

The issue is that sed appends "/latest-per-pkg" to the end of the
entire space-separated string rather than to each jail name individually.
This results in a malformed path like:
  "neptune-amd64-default odin-amd64-default saturn-amd64-default/latest-per-pkg"

Fix by converting spaces to newlines before the sed operation, ensuring
each jail name gets the suffix appended correctly.

Fixes #1157

do_confirm_delete: document return statuses

jail -d: Make code clearer that 'cache_dir' expands.

This was a leftover from an old change that did not hardcode
the cache_dir.

No functional change.

jail -d: Ensure cleandir vars expand POUDRIERE_DATA.

No functional change.

jail -d -C: Regenerate HTML json files after trimming logs.

Fixes #694

jail -d: Tweaks; Allow rerunning and multiple -C flags.

- jail -d can now be reran to cleanup any leftover files.
- -C can be specified multiple times.
- Display each dir as it is cleaned up.
- Stop force deleting the cache dir.
- Speedup finding logs by separating out the latest-per-pkg traversal.
- Support cleaning up images.

Issue #694

do_confirm_delete: Count files once.

jail -d -C wrkdirs: Delete proper wrkdirs directory.

Issue #694

Makefile.am: Fix spelling of PACKAGE_VERSION.

This has no functional change. It actually avoided a
substitution bug.

poudriere: Fix substituting default USE_DEBUG

do_confirm_delete: Cleanup the return statuses.

Make this return either 0 or 1 as normal functions do. This fixes
errors not being detectable.

Add 2 output vars that can communicate what was done.

This also fixes the `pkgclean done` hook to properly pass in whether
files were deleted.

pkgclean: fix dry-run still generating repo

Fixes: 7c39d9685ae6e4b3f6ffeef713126d290e7d8a42

Makefile.am: Fix spelling of PACKAGE_VERSION.

This has no functional change. It actually avoided a
substitution bug.

(cherry picked from master)

jail_start: MASTERMNT is expected to be set when entering here.

No reason to export MASTERMNT

nullfs_paths() does not use the mnt param

Add inhost()

- Deals with MASTERMNT clearing needs
- Avoids injail()

tests: Simplify OVERLAYSDIR handling.

This removes the MASTERMNT symlink hacks that were shadowed and
not cleaned up properly.

The behavior was only that way because MASTERMNTREL is referenced
in _lookup_port_dir(). It can just be blank though and read from
the git checkout.

relpath: Handle local scope clearing of var.

Add in_dir()

_mastermnt: cleanup internal style a bit

tests: Fix setup_overlays leaking out 'o' var

bulk fetching and -i: must disable pkgbase repo.

A pkgbase jail made by Poudriere will setup a repo named `pkgbase` which
must be disabled to ensure we use the branch passed in PACKAGE_FETCH_BRANCH.

Fixes #1312

(cherry picked from commit 422ff54ea9fcf7ce4feca216e93c8524026393ad)

bulk fetching and -i: must disable pkgbase repo.

A pkgbase jail made by Poudriere will setup a repo named `pkgbase` which
must be disabled to ensure we use the branch passed in PACKAGE_FETCH_BRANCH.

Fixes #1312

do_confirm_delete: Count files once.

(cherry picked from master)

Conflicts:
        src/share/poudriere/common.sh

pkgclean: fix dry-run still generating repo

Fixes: 7c39d9685ae6e4b3f6ffeef713126d290e7d8a42
(cherry picked from master)

jail -d -C wrkdirs: Delete proper wrkdirs directory.

Issue #694

(cherry picked from master)

jail -d: Ensure cleandir vars expand POUDRIERE_DATA.

No functional change.

(cherry picked from master)

Fix distfile caching for flavored ports.

gather_distfiles() used to lookup `make -V ALLFILES` for the given
originspec.  Then it was changed in commit ded8d39bf7 to cache that
information up-front in gather_port_vars().  There is an existing
problem where deps_fetch_vars() uses the flavorless port origin
for originspec, but gather_distfiles() uses the flavored originspec.
That is, deps_fetch_vars() uses `origin` while gather_distfiles()
uses `origin at default`.  The default flavor gets stripped off in
gather_port_vars_port() for some reason.  This problem is avoided
by using the pkgname.

Similarly the pkgname lookup should use get_pkgname_from_originspec()
which deals with this problem.

Fixes: ded8d39bf7 ("bulk: Fetch DISTFILES info from ports upfront.")
Fixes #1302