Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuke Shumaker <lukeshu@parabola.nu>2017-05-12 19:57:05 -0400
committerErich Eckner <git@eckner.net>2017-07-14 07:00:40 +0200
commit77679c4c6c2f45cd39c6db156ac6c6b48076c69a (patch)
tree3180bd5ae6bd77e24da497ff1c5d51a76aac0134
parentcd000ccc0144c7ec54696520bf7217163a39cde0 (diff)
makechrootpkg: Fix broken symlinks because of chroot SRCPKGDEST /srcpkgdest
Commit 58968cf fixed symlinks for package products in $startdir in light of the simplified chroot setup. However, a similar change needs to be made for source-package products. This was an easy omission to make because makechrootpkg does not produce source-pakcages by default.
-rw-r--r--makechrootpkg.in5
1 files changed, 5 insertions, 0 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in
index 71bc9dc..5bcb82b 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -314,6 +314,11 @@ move_products() {
for s in "$copydir"/srcpkgdest/*; do
chown "$src_owner" "$s"
mv "$s" "$SRCPKGDEST"
+
+ # Fix broken symlink because of temporary chroot SRCPKGDEST /srcpkgdest
+ if [[ "$PWD" != "$SRCPKGDEST" && -L "$PWD/${s##*/}" ]]; then
+ ln -sf "$SRCPKGDEST/${s##*/}"
+ fi
done
}
# }}}