Mirror/pmbootstrap
1
0
Fork 1
mirror of https://gitlab.postmarketos.org/postmarketOS/pmbootstrap.git synced 2025-07-13 11:29:46 +03:00
Code Issues Wiki Activity

Rewrite repo_missing for bpo + systemd split repo (MR 2410)

Browse source 
The "pmbootstrap repo_missing" action is used exclusively by bpo. It
calls it only with these arguments:

  pmbootstrap repo_missing --built --arch "$ARCH"

A blocker for merging systemd into pmaports master is, that the
current repo_missing code cannot display packages that are both in
extra-repos/systemd and in another path. I have considered just not
supporting this and discussed doing that with Caleb and Clayton, but we
figured it would be a major obstacle in the future to not be able to
easily override packages with systemd specific versions (currently we
need this for 3 packages).

Integrating this into the existing repo_missing code would be hacks upon
hacks. Also the scope of the current repo_missing code has many extra
features that are not used and would be extra effort to carry along:
* Allow specifying a pkgname
* Running without --built
* --overview

So I decided to replace the repo_missing code with a much simpler, more
modern implementation, that does exactly what is needed:
* Duplicate packages in systemd and non-systemd dirs are displayed
* The output always include all packages, no matter if they are already
  built or not (same behavior as with --built)
* Removed --overview and selecting specific packages too
* The code for filling "repo" (either "systemd" or None) is more
  resilient now, as it can use proper relative paths to the root of
  pmaports. Unlike the previous implementation, it will not fail if
  subdirs are added to the systemd dir.

I have made sure that the output is exactly the same as before on
current pmaports master.

Related: bpo issue 144
Related: bpo issue 140
This commit is contained in:
Oliver Smith 2024-09-25 21:52:58 +02:00
parent 62e32e15a9
commit 8d446c2aeb
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
3 changed files with 59 additions and 168 deletions
Download patch file Download diff file Expand all files Collapse all files

8
pmb/helpers/frontend.py
View file

@ -285,9 +285,13 @@ def config(args: PmbArgs) -> None:
def repo_missing(args: PmbArgs) -> None:
if args.arch is None or isinstance(args.package, list):
if args.arch is None:
raise AssertionError
missing = pmb.helpers.repo_missing.generate(args.arch, args.overview, args.package, args.built)
if args.built:
logging.warning(
"WARNING: --built is deprecated (bpo#148: this warning is expected on build.postmarketos.org for now)"
)
missing = pmb.helpers.repo_missing.generate(args.arch)
print(json.dumps(missing, indent=4))