Jan Alexander Steffens (heftig) pushed to branch main at Arch Linux / Packaging
/ Packages / meson
Commits:
b7a48751 by Jan Alexander Steffens (heftig) at 2026-05-22T20:36:06+02:00
arch-meson-check-wraps: Simplify exit
- - - - -
3 changed files:
- .SRCINFO
- PKGBUILD
- arch-meson-check-wraps
Changes:
=====================================
.SRCINFO
=====================================
@@ -85,7 +85,7 @@ pkgbase = meson
validpgpkeys = BD27B07A5EF45C2ADAF70E0484818A6819AF4A9B
b2sums =
a7db9025bb0aa639ae7994260f5d41bbc74016adad76e10a57823f80ad5ca20374adcac40ea1f1e922714310e1768dd0e17d3ec9024d2ecc7fcf8a8c6e153fb4
b2sums =
ad9c206dd8ceab44e5f499e50a75736c4e8b803201e96ac07da6b088a166154f1478b10749a87c9dca2815a50f77b5c7f404b4e424d823bae5c8620c3aa05487
- b2sums =
36730753b42733ba4848aed2129a68f0e3c4386f34929dc7f02e153fdb249d2a721ee05730b9bf3387d6f3811306c1f0af0d71271022dbfa8bc07228aa14d036
+ b2sums =
3e8ccfad662f774631930a0c278ed0532cde8bee211f8a179d5d506efbd7065536fad31494c375bebdf2ddc661cdab9abd30ac5e0a302836a6e1692a31508915
b2sums =
caf0775556b998968bcd658fa03c71aab8828eb30476693c1f5c318f9972f7cadee1d62d9ce07a1cd5ab71472484ad31f5fbde87820422ae3e4efa60c656fe2d
b2sums =
7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e
=====================================
PKGBUILD
=====================================
@@ -95,7 +95,7 @@ source=(
)
b2sums=('a7db9025bb0aa639ae7994260f5d41bbc74016adad76e10a57823f80ad5ca20374adcac40ea1f1e922714310e1768dd0e17d3ec9024d2ecc7fcf8a8c6e153fb4'
'ad9c206dd8ceab44e5f499e50a75736c4e8b803201e96ac07da6b088a166154f1478b10749a87c9dca2815a50f77b5c7f404b4e424d823bae5c8620c3aa05487'
-
'36730753b42733ba4848aed2129a68f0e3c4386f34929dc7f02e153fdb249d2a721ee05730b9bf3387d6f3811306c1f0af0d71271022dbfa8bc07228aa14d036'
+
'3e8ccfad662f774631930a0c278ed0532cde8bee211f8a179d5d506efbd7065536fad31494c375bebdf2ddc661cdab9abd30ac5e0a302836a6e1692a31508915'
'caf0775556b998968bcd658fa03c71aab8828eb30476693c1f5c318f9972f7cadee1d62d9ce07a1cd5ab71472484ad31f5fbde87820422ae3e4efa60c656fe2d'
'7d88929d5a3b49d91c5c9969f19d9b47f3151706526b889515acaeda0141257d5115875ac84832e9ea46f83a7700d673adcc5db84b331cd798c70ae6e90eac1e')
validpgpkeys=(
=====================================
arch-meson-check-wraps
=====================================
@@ -19,10 +19,7 @@ def msg(message="", attr=""):
def exit(message="", attr: str | None = None, code=1):
if attr is None:
attr = "97" if code == 0 else "91"
- if message:
- msg(message, attr)
- if code == 0:
- msg()
+ msg(message, attr)
sys.exit(code)
@@ -72,7 +69,7 @@ for wrapfile in wrapfiles:
wraps.append((wrapfile.name, wraptype, directory, section))
if not wraps:
- exit(f"\n{srcdir.name} has no valid wrap files", attr="93", code=0)
+ exit(f"{srcdir.name} has no valid wrap files", attr="93", code=0)
repos: list[tuple[str, Path, SectionProxy]] = []
name_max = max(len(wrapname) for wrapname, _, _, _ in wraps)
@@ -105,6 +102,8 @@ for wrapname, pkgdir, section in repos:
if not want_ref:
msg(f"Wrap file {wrapname} has no revision", attr="93")
continue
+ if want_ref == "head":
+ want_ref = "origin/HEAD"
if not (pkgdir / ".git").exists():
msg(f"Cached dir {pkgdir} is not a git worktree", attr="93")
@@ -118,8 +117,6 @@ for wrapname, pkgdir, section in repos:
have_rev = None
try:
- if want_ref == 'head':
- want_ref = 'origin/HEAD'
want_rev = check_output(
["git", "-C", pkgdir, "rev-parse", "-q", "--verify", want_ref],
text=True
).strip()
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/meson/-/commit/b7a4875132c678b2e5c7240c73ccf1a28b66f0af
--
View it on GitLab:
https://gitlab.archlinux.org/archlinux/packaging/packages/meson/-/commit/b7a4875132c678b2e5c7240c73ccf1a28b66f0af
You're receiving this email because of your account on gitlab.archlinux.org.
Manage all notifications: https://gitlab.archlinux.org/-/profile/notifications
| Help: https://gitlab.archlinux.org/help
