From: Marius Mauch <genone@gentoo.org>
Date: Tue, 5 Jun 2007 16:58:08 +0000 (-0000)
Subject: Use user-provided $mv_opts for -5 (bug #47442)
X-Git-Tag: v2.2_pre1~1295
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=cf17db9cba53ccd3e8fe2563a46a38da947d5e8f;p=portage.git

Use user-provided $mv_opts for -5 (bug #47442)

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

diff --git a/bin/etc-update b/bin/etc-update
index fd192b0e7..0daf04d40 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