From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 16 Aug 2007 21:49:34 +0000 (-0000)
Subject: Make etc-update copy owner and group bits when it merges config files.
X-Git-Tag: v2.2_pre1~877
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=8eef17d8a2e9dcfd839de13e90da036f44b3eff9;p=portage.git

Make etc-update copy owner and group bits when it merges config files.

svn path=/main/trunk/; revision=7636
---

diff --git a/bin/etc-update b/bin/etc-update
index 0daf04d40..27d7bca35 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -388,8 +388,10 @@ Please select from the menu above (-1 to exit, losing this merge): "
 			case ${my_input} in
 				1) echo "Replacing ${ofile} with ${mfile}"
 				   if [[ ${USERLAND:-GNU} == GNU ]]; then
+				       chown --reference="${ofile}" "${mfile}"
 				       chmod --reference="${ofile}" "${mfile}"
 				   else
+				       chown "$(stat -f %Su:%Sg "${ofile}")" "${mfile}"
 				       chmod $(stat -f %Mp%Lp "${ofile}") "${mfile}"
 				   fi
 				   mv ${mv_opts} ${mfile} ${ofile}