aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2025-02-21 17:24:38 +0200
committernl6720 <nl6720@gmail.com>2025-02-21 17:24:38 +0200
commitaa775f003d266f2c479c16e62769e6fa605561c9 (patch)
treee43750cd8bdd17c06713697203aefdffbce25a82
parenta92371f940fc3d098debe958405783e2ede00baf (diff)
downloadarchiso-aa775f003d266f2c479c16e62769e6fa605561c9.tar.gz
archiso-aa775f003d266f2c479c16e62769e6fa605561c9.tar.bz2
mkarchiso: do not hide pacstrap's stderr
If the `pacstrap` command fails, e.g. because of an invalid package name, it is useful to see the error message even if verbose output is not enabled. Fixes https://gitlab.archlinux.org/archlinux/archiso/-/issues/238
-rw-r--r--CHANGELOG.rst2
-rwxr-xr-xarchiso/mkarchiso2
2 files changed, 3 insertions, 1 deletions
diff --git a/CHANGELOG.rst b/CHANGELOG.rst
index 17b6e51..5d6b50c 100644
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -17,6 +17,8 @@ Deprecated
Fixed
-----
+- Do not hide ``pacstrap`` errors in non-verbose mode.
+
Removed
-------
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index 2514a55..553d0d2 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -351,7 +351,7 @@ _make_packages() {
# Unset TMPDIR to work around https://bugs.archlinux.org/task/70580
if [[ "${quiet}" = "y" ]]; then
- env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" &>/dev/null
+ env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}" >/dev/null
else
env -u TMPDIR pacstrap -C "${work_dir}/${buildmode}.pacman.conf" -c -G -M -- "${pacstrap_dir}" "${buildmode_pkg_list[@]}"
fi