diff options
| author |   Ulrich Müller <ulm@gentoo.org> | 2023-12-24 11:54:27 +0100 |
|---|---|---|
| committer | Ulrich Müller <ulm@gentoo.org> | 2023-12-27 16:09:32 +0100 |
| commit | cb788dd9acf9f48a9c4934920ebadaa942fe0682 (patch) | |
| tree | 9f29912d6a2c2ef435339ac105a623103652991e /bin | |
| parent | emerge: enable "avoid spamming too much info about unused binpkgs" again (diff) | |
| download | portage-cb788dd9acf9f48a9c4934920ebadaa942fe0682.tar.gz portage-cb788dd9acf9f48a9c4934920ebadaa942fe0682.tar.bz2 portage-cb788dd9acf9f48a9c4934920ebadaa942fe0682.zip | |
ebuild.sh: Warn about colon-separated argument in sandbox functions
According to PMS and the Devmanual, only a single item is allowed
as argument for addread, addwrite, adddeny and addpredict:
https://projects.gentoo.org/pms/8/pms.html#x1-12300012.3.3
https://devmanual.gentoo.org/function-reference/sandbox-functions/
The previous usage message (contrary to Devmanual policy) had been
added in commit 0c6454261c514f021a4ddce2415a68773027ed6a.
Bug: https://bugs.gentoo.org/920654
Signed-off-by: Ulrich Müller <ulm@gentoo.org>
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/ebuild.sh | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/bin/ebuild.sh b/bin/ebuild.sh index dc8d205f9..c9f7c04e2 100755 --- a/bin/ebuild.sh +++ b/bin/ebuild.sh @@ -162,7 +162,10 @@ fi __sb_append_var() { local _v=$1 ; shift local var="SANDBOX_${_v}" - [[ -z $1 || -n $2 ]] && die "Usage: add$(LC_ALL=C tr "[:upper:]" "[:lower:]" <<< "${_v}") <colon-delimited list of paths>" + [[ $# -eq 1 ]] || die "Usage: add${_v,,} <path>" + # Make this fatal after 2024-12-31 + [[ ${1} == *:* ]] \ + && eqawarn "QA Notice: add${_v,,} called with colon-separated argument" export ${var}="${!var:+${!var}:}$1" } # bash-4 version: @@ -173,8 +176,9 @@ addwrite() { __sb_append_var WRITE "$@" ; } adddeny() { __sb_append_var DENY "$@" ; } addpredict() { __sb_append_var PREDICT "$@" ; } +addread / +addread "${PORTAGE_TMPDIR}/portage" addwrite "${PORTAGE_TMPDIR}/portage" -addread "/:${PORTAGE_TMPDIR}/portage" [[ -n ${PORTAGE_GPG_DIR} ]] && addpredict "${PORTAGE_GPG_DIR}" # Avoid sandbox violations in temporary directories. |