From: Zac Medico <zmedico@gentoo.org>
Date: Fri, 8 Jun 2007 19:23:28 +0000 (-0000)
Subject: Use user-provided  for -5 (bug #47442) (trunk r6735)
X-Git-Tag: v2.1.2.10~15
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=208449403286dc93a5a22185faa028e43b8e75c2;p=portage.git

Use user-provided  for -5 (bug #47442) (trunk r6735)

svn path=/main/branches/2.1.2/; revision=6756
---

diff --git a/bin/etc-update b/bin/etc-update
index 742aed1b5..a6378a142 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -176,7 +176,8 @@ configuration file is followed by a list of possible replacement files."
 			fi
 			if [[ ${input} == -5 ]] ; then
 				input=-3
-				export mv_opts=""
+				export mv_opts=" ${mv_opts} "
+				mv_opts="${mv_opts// -i / }"
 			fi
 			if [[ ${input} == -3 ]] ; then
 				input=0