Skip to content

Commit 75dfdc6

Browse files
committed
fix: use correct makepkg.conf location without silently failing
There was a typo when implementing the new devtools makepkg.conf location. Unfortunately the code failed silently which made it not be detected until now. Fix this by using the correct location as well as switch to a simple fall-through approach so we can easily fail instead of silently and invisibly doing the wrong thing leading to false-negative unreproducible packages. Fixes 63ce751
1 parent d0a4971 commit 75dfdc6

File tree

1 file changed

+8
-5
lines changed

1 file changed

+8
-5
lines changed

repro.in

+8-5
Original file line numberDiff line numberDiff line change
@@ -496,11 +496,14 @@ else
496496
pacman --noconfirm --needed -Sddu "$DEVTOOLS_PKG"
497497
fi
498498

499-
for makepkg_path in /usr/share/devtools/{makepkg-x86_64.conf,makepkg.d/x86_64.conf}; do
500-
if [ -f "\$makepkg_path" ]; then
501-
cp -v "\$makepkg_path" /mnt/etc/makepkg.conf
502-
fi
503-
done
499+
if [[ -f /usr/share/devtools/makepkg.conf.d/x86_64.conf ]]; then
500+
cp -v /usr/share/devtools/makepkg.conf.d/x86_64.conf /mnt/etc/makepkg.conf
501+
elif [[ -f /usr/share/devtools/makepkg-x86_64.conf ]]; then
502+
cp -v /usr/share/devtools/makepkg-x86_64.conf /mnt/etc/makepkg.conf
503+
else
504+
echo "Failed to find the makepkg.conf location, please report to archlinux-repro"
505+
exit 1
506+
fi
504507
__END__
505508
lock_close 9 "$KEYRINGCACHE/$keyring_package.lock"
506509

0 commit comments

Comments
 (0)