This commit is contained in:
@@ -316,13 +316,13 @@ jobs:
|
|||||||
PKGS+=("$pkg")
|
PKGS+=("$pkg")
|
||||||
done < packages.x86_64
|
done < packages.x86_64
|
||||||
|
|
||||||
# Use pacman -Sp --print to resolve the full install set and check for conflicts
|
# Run pacman directly with the array to catch conflict errors
|
||||||
# This catches "X and Y are in conflict" errors before the ISO build
|
if CONFLICTS=$(pacman -Sp --needed "${PKGS[@]}" 2>&1); then
|
||||||
PKG_LIST=$(printf '%s\n' "${PKGS[@]}")
|
|
||||||
if CONFLICTS=$(echo "$PKG_LIST" | pacman -Sp --needed - 2>&1); then
|
|
||||||
echo "✅ No package conflicts detected"
|
echo "✅ No package conflicts detected"
|
||||||
else
|
else
|
||||||
echo "$CONFLICTS" | grep -i "conflict" || true
|
echo "------- Pacman Output -------"
|
||||||
|
echo "$CONFLICTS"
|
||||||
|
echo "-----------------------------"
|
||||||
echo ""
|
echo ""
|
||||||
echo "═══════════════════════════════════════════════════════════════"
|
echo "═══════════════════════════════════════════════════════════════"
|
||||||
echo " ❌ Conflicting packages found — fix packages.x86_64"
|
echo " ❌ Conflicting packages found — fix packages.x86_64"
|
||||||
|
|||||||
Reference in New Issue
Block a user