Skip to content

Commit

Permalink
fix: use correct makepkg.conf location without silently failing
Browse files Browse the repository at this point in the history
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
  • Loading branch information
anthraxx committed Feb 15, 2024
1 parent d0a4971 commit 75dfdc6
Showing 1 changed file with 8 additions and 5 deletions.
13 changes: 8 additions & 5 deletions repro.in
Original file line number Diff line number Diff line change
Expand Up @@ -496,11 +496,14 @@ else
pacman --noconfirm --needed -Sddu "$DEVTOOLS_PKG"
fi

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

Expand Down

0 comments on commit 75dfdc6

Please sign in to comment.