From 55c2a30bd123f8b2c0c0e427f97b99ee76ba9dad Mon Sep 17 00:00:00 2001 From: Pekka Ristola Date: Thu, 1 Jun 2023 19:51:56 +0300 Subject: [PATCH] r-ps: fix another build error also don't print all the PKGBUILD variables to log --- BioArchLinux/r-ps/lilac.yaml | 2 +- lilac-extensions/lilac_r_utils.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/BioArchLinux/r-ps/lilac.yaml b/BioArchLinux/r-ps/lilac.yaml index 79a579de52..4e69973880 100644 --- a/BioArchLinux/r-ps/lilac.yaml +++ b/BioArchLinux/r-ps/lilac.yaml @@ -6,4 +6,4 @@ update_on: cran: ps - alias: r - source: manual - manual: 2 + manual: 3 diff --git a/lilac-extensions/lilac_r_utils.py b/lilac-extensions/lilac_r_utils.py index d6c353c7fa..ecc9c5e12e 100644 --- a/lilac-extensions/lilac_r_utils.py +++ b/lilac-extensions/lilac_r_utils.py @@ -120,7 +120,8 @@ class Pkgbuild: ] def __init__(self): - output = run_protected(["/bin/bash", "-c", "source PKGBUILD && declare -p"]) + cmd = ["/bin/bash", "-c", "source PKGBUILD && declare -p"] + output = run_protected(cmd, silent = True) # assume that variable values never contain newlines for line in output.splitlines(): self._parse_line(line) @@ -198,7 +199,7 @@ license_map = { def get_default_r_pkgs() -> set: """Get the set of R packages included in the R distribution itself""" - provides = pyalpm.Handle("/", PACMAN_DB_DIR).register_syncdb("extra", 0).get_pkg("r").provides + provides = pyalpm.Handle("/", str(PACMAN_DB_DIR)).register_syncdb("extra", 0).get_pkg("r").provides return { pr.split("=", 1)[0] for pr in provides } class CheckFailed(Exception):