Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--makechrootpkg.in15
1 files changed, 13 insertions, 2 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index a0a95a7..dfea18c 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -387,17 +387,28 @@ if (( ret != 0 )); then
else
if (( run_checkpkg )); then
msg "Running checkpkg"
- remotepkgs=($(pacman -Syddp --logfile /dev/null "${pkgnames[@]}"|grep '://'))
+
+ # sync off-site databases for up-to-date queries
+ trap 'rm -rf $dbpath; cleanup' EXIT INT TERM QUIT
+ dbpath=$(mktemp -d --tmpdir makechrootpkg-database.XXXXXXXXXX)
+ mkdir -p "$dbpath"
+ pacman -Sy --dbpath "$dbpath" --logfile /dev/null
+
+ # query current package locations
+ remotepkgs=($(pacman -Sddp --dbpath "$dbpath" --logfile /dev/null "${pkgnames[@]}"))
if (( $? )); then
warning "Skipped checkpkg due to missing repo packages"
exit 0
fi
+
+ # download package files if any non-local location exists
for remotepkg in "${remotepkgs[@]}"; do
[[ $remotepkg == file://* ]] && continue
msg2 "Downloading current versions"
- pacman --noconfirm -Swdd --logfile /dev/null "${pkgnames[@]}"
+ pacman --noconfirm -Swdd --dbpath "$dbpath" --logfile /dev/null "${pkgnames[@]}"
break
done
+
msg2 "Checking packages"
sudo -u "$makepkg_user" checkpkg --rmdir --warn
fi