The issue was that "repo-remove repo.tar.gz $pkgbase-debug" removes the
currently published debug package. We need to check if it's part of the
database or not before removing it.

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

All top-level calls to "repo_lock" has an exit condition. This was never
added when the function was refactored to include debug packages. Thus
we never really did `exit 1` on invalid locks.

This reimplements some form of return code we can be sure we at least
exit if we don't have a valid lock.

Signed-off-by: Morten Linderud <morten@linderud.pw>

This allows us to also remove any debug packages still left in the pool when we
attempt to clean up the actual package.

Signed-off-by: Morten Linderud <morten@linderud.pw>

If we try to clean empty pools we are going to block on stdin for sort.

This also fixes the test suite currently timing out.

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

We expand the internal __checkRepoRemovedPackage function with globfile
lookups towards DEBUGPKGPOOL and the debug repository. This ensures we
should get a hit for the relevant debug packages.

Signed-off-by: Morten Linderud <morten@linderud.pw>

This implementation is probably the easiest one and/or cheap. After
building a list of all packages in the repositories we filter the lists
into two separate working lists. One for normal packages and one for
debug packages.

The only issue is that we can encounter globs with no matching cleanup
lists, like when running ftpdir-cleanup after the debug package changes
has been introduced, but before deploying new repositories. We guard
against this by ensuring we have found debug packages, and normal
packages, before checking the working lists.

This introduces some duplicated code but should be fine. Rest of the
logic is mirrored between the two package pools.

Signed-off-by: Morten Linderud <morten@linderud.pw>

This allows us to test multiple packages, which is relevant for
ftpdir-cleanup later on.

Signed-off-by: Morten Linderud <morten@linderud.pw>

This adds a test case for debug packages. It should be noted that
nothing has really been changed to support this. This just check that
db-repo-remove can remove a package from a *-debug repository with a
-debug suffix. However, nice to have this in case regressions.

Signed-off-by: Morten Linderud <morten@linderud.pw>

We check if there is a debug package found in the mirroring debug
repository and mark this as `is_debug` if found. This creates the needed
symlinks for the package pool.

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

We check if there is a globfile match for a debug package when removing
the package from the main repository.

This also adds a guard to the usual package removal, and removing an
unused variable.

Signed-off-by: Morten Linderud <morten@linderud.pw>

Internally this uses db-move, so this should just do the correct thing.

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

This ensures we do not have the debug repository at hand when looking at
the SVN state files. However, there is no good way to figure out if we
have a debug package as .BUILDINFO nor .PKGINFO has the information we
need.

We blindly assume that any package where we look up a *-debug repository
is a debug package.

Signed-off-by: Morten Linderud <morten@linderud.pw>

The gist of this change is to always peak into the DEBUGPKGPOOL and
ensure if a ${pkgbase}-debug exists in the debug repository.

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

We simply remove the -debug prefix if present and ensure we are checking
the SVN repository for the PKGBUILD in the actual repository.

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Signed-off-by: Morten Linderud <morten@linderud.pw>

Eli Schwartz authored Mar 14, 2021 and Morten Linderud committed Nov 20, 2021

These are not debug prints, don't stick them in the same commit...