[arch-projects] [devtools][PATCH] Fix ownership when copying files from chroot to system

Florian Pritz bluewind at xinu.at
Sat Aug 11 06:17:56 EDT 2012


Previously files were always owned by nobody which means trying to write
to them directly would fail because only the owner has +w.

Signed-off-by: Florian Pritz <bluewind at xinu.at>
---
 makechrootpkg.in | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/makechrootpkg.in b/makechrootpkg.in
index 48675d7..9ed7161 100644
--- a/makechrootpkg.in
+++ b/makechrootpkg.in
@@ -25,6 +25,7 @@ passeddir=
 default_copy=$USER
 [[ -n $SUDO_USER ]] && default_copy=$SUDO_USER
 [[ -z $default_copy || $default_copy = root ]] && default_copy=copy
+src_owner=${SUDO_USER:-$USER}
 
 usage() {
 	echo "usage ${0##*/} [options] -r <chrootdir> [--] [makepkg args]"
@@ -292,10 +293,12 @@ if mkarchroot -r "/chrootbuild" "$copydir"; then
 			popd >/dev/null
 		fi
 
+		chown "$src_owner" "$pkgfile"
 		mv "$pkgfile" "$PKGDEST"
 	done
 
 	for l in "$copydir"/build/*-{build,check,namcap,package,package_*}.log; do
+		chown "$src_owner" "$l"
 		[[ -f $l ]] && mv "$l" .
 	done
 else
@@ -304,6 +307,7 @@ else
 fi
 
 for f in "$copydir"/srcdest/*; do
+	chown "$src_owner" "$f"
 	mv "$f" "$SRCDEST"
 done
 
-- 
1.7.11.4


More information about the arch-projects mailing list