From: Marius Mauch <genone@gentoo.org>
Date: Wed, 19 Jul 2006 09:57:31 +0000 (-0000)
Subject: Show full path when auto-merging
X-Git-Tag: v2.1.1~197
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=3ae45027783c90420579143bfbf72476ac232aea;p=portage.git

Show full path when auto-merging

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

diff --git a/bin/etc-update b/bin/etc-update
index 41def58a1..06ac3ddef 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -71,7 +71,7 @@ function scan() {
 					MATCHES=1
 				fi
 				if [[ "${MATCHES}" == "1" ]]; then
-					echo "Automerging trivial changes in: ${rfile:10}"
+					echo "Automerging trivial changes in: ${rpath}/${rfile:10}"
 					mv ${rpath}/${rfile} ${rpath}/${rfile:10}
 					continue
 				else