From aa775f003d266f2c479c16e62769e6fa605561c9 Mon Sep 17 00:00:00 2001
From: nl6720 <nl6720@gmail.com>
Date: Fri, 21 Feb 2025 17:24:38 +0200
Subject: 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
---
 CHANGELOG.rst     | 2 ++
 archiso/mkarchiso | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

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
-- 
cgit v1.2.3-70-g09d2