[arch-projects] [devtools][PATCH] makechrootpkg: Fix broken symlinks because of chroot SRCPKGDEST /srcpkgdest

Luke Shumaker lukeshu at parabola.nu
Fri May 12 23:57:05 UTC 2017


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.
---
 makechrootpkg.in | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/makechrootpkg.in b/makechrootpkg.in
index ffe6e42..246774a 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -313,6 +313,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
 }
 # }}}
-- 
2.13.0


More information about the arch-projects mailing list