Mathieu Benoit
3d2a1485af
python-packaging's PKGBUILD says pkgver=26.3 and the installed module reported 25.0. The vendored builder selected by _bootstrap=1 carries its OWN copy of each project, older than the release the PKGBUILD names. Nothing about the package looked wrong; only `packaging.__version__` disagreed with its own name, and the mismatch surfaced two packages later: python-vcs-versioning: packaging>=26.2 a floor our own package met on paper and not in fact. _bootstrap is now a probe evaluated by makepkg, in the build environment: if `build` and `installer` import, the real path works and the vendored copies are not wanted. A hook could not decide this -- hooks run on the HOST even for stage 2, so a probe written there cannot answer for the chroot. The license install then had to handle both layouts, since the source tree is a git clone under $pkgname when bootstrapping and a release tarball otherwise. Hardcoding either breaks the other, and this hook had hardcoded the clone -- right only while _bootstrap was always 1. --- FR --- Le PKGBUILD de python-packaging annonce pkgver=26.3 et le module installé rapportait 25.0. Le constructeur embarqué que sélectionne _bootstrap=1 porte ses PROPRES copies de chaque projet, plus anciennes que la version nommée. Rien dans le paquet n'avait l'air faux ; seul `packaging.__version__` contredisait son propre nom, et l'écart est apparu deux paquets plus loin : python-vcs-versioning: packaging>=26.2 un plancher que notre paquet satisfaisait sur le papier et non en fait. _bootstrap est désormais une sonde évaluée par makepkg, dans l'environnement de construction : si `build` et `installer` s'importent, la voie normale fonctionne et les copies embarquées ne sont pas voulues. Un hook ne pouvait pas trancher — les hooks tournent sur l'HÔTE même pour l'étage 2, donc une sonde écrite là ne peut pas répondre pour le chroot. L'installation de la licence devait alors gérer les deux dispositions, l'arbre source étant un clone git sous $pkgname en mode bootstrap et une archive sinon. Écrire l'une en dur casse l'autre, et ce hook avait écrit le clone en dur — juste seulement tant que _bootstrap valait toujours 1. Assisted-by: Claude Opus 5
56 lines
2.9 KiB
Bash
Executable file
56 lines
2.9 KiB
Bash
Executable file
#!/usr/bin/env bash
|
|
# One of the six packages in the Python packaging cycle. The reasoning, and the
|
|
# edit, are shared -- see lib-python-bootstrap.sh.
|
|
set -euo pipefail
|
|
source "$(dirname "$0")/lib-python-bootstrap.sh"
|
|
|
|
# The license install assumes the NON-bootstrap layout, unconditionally.
|
|
#
|
|
# install -vDm644 -t "$pkgdir/usr/share/licenses/$pkgname" \
|
|
# $srcdir/$_name-$pkgver/LICENSE*
|
|
#
|
|
# sits outside the `if (( _bootstrap == 0 ))`, but with _bootstrap=1 the source
|
|
# array is a set of git clones and there is no packaging-26.3 directory at all:
|
|
#
|
|
# install: cannot stat '.../src/packaging-26.3/LICENSE*'
|
|
#
|
|
# The clone is at $srcdir/python-packaging, and it carries LICENSE,
|
|
# LICENSE.APACHE and LICENSE.BSD. The other five PKGBUILDs handle this by
|
|
# naming a bootstrap-specific path in their else branch; this one just misses
|
|
# it, so the fix follows their shape rather than inventing one.
|
|
python3 - <<'ZZPY'
|
|
import io, re
|
|
lines = io.open("PKGBUILD", encoding="utf-8").read().split("\n")
|
|
hit = [i for i, l in enumerate(lines) if "LICENSE*" in l and "$_name-$pkgver" in l]
|
|
assert len(hit) == 1, "python-packaging: expected one license install, got %d" % len(hit)
|
|
# BOTH LAYOUTS, because _bootstrap is now a probe rather than a constant
|
|
# (see lib-python-bootstrap.sh). With the vendored builder the sources are git
|
|
# clones under $srcdir/$pkgname; without it they are the release tarball under
|
|
# $srcdir/$_name-$pkgver. Hardcoding either one breaks the other, and the first
|
|
# version of this hook hardcoded the clone -- correct only while _bootstrap was
|
|
# always 1.
|
|
lines[hit[0]] = re.sub(
|
|
r"\$srcdir/\$_name-\$pkgver/LICENSE\*",
|
|
'"$srcdir/$pkgname"/LICENSE* "$srcdir/$_name-$pkgver"/LICENSE*',
|
|
lines[hit[0]])
|
|
# install -t with two globs would fail on whichever does not exist, so the
|
|
# whole line becomes a loop over what is actually there.
|
|
ind = re.match(r"^[ \t]*", lines[hit[0]]).group(0)
|
|
lines[hit[0]:hit[0] + 1] = [
|
|
ind + '# The sources are a git clone under $pkgname when the vendored builder',
|
|
ind + '# is used, and the release tarball otherwise. Take whichever exists.',
|
|
ind + 'for _lic in "$srcdir/$pkgname"/LICENSE* "$srcdir/$_name-$pkgver"/LICENSE*; do',
|
|
ind + ' [ -f "$_lic" ] && install -vDm644 "$_lic" -t "$pkgdir/usr/share/licenses/$pkgname"',
|
|
ind + 'done',
|
|
]
|
|
io.open("PKGBUILD", "w", encoding="utf-8").write("\n".join(lines))
|
|
ZZPY
|
|
grep -q 'Take whichever exists' PKGBUILD || {
|
|
echo "python-packaging: the license loop was not inserted" >&2; exit 1; }
|
|
# Matched against what is actually written -- the inserted line quotes the
|
|
# directory, `"$srcdir/$_name-$pkgver"/LICENSE*`, so a pattern expecting the
|
|
# slash to follow $pkgver directly finds nothing. The first version of this guard
|
|
# did exactly that and failed on a correct file.
|
|
grep -q '_name-\$pkgver"/LICENSE\*' PKGBUILD || {
|
|
echo "python-packaging: the tarball layout was dropped" >&2; exit 1; }
|
|
echo "python-packaging: license taken from the bootstrap clone"
|