aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2012-07-18 13:23:38 -0700
committerZac Medico <zmedico@gentoo.org>2012-07-18 13:23:38 -0700
commitd134e60407c65b04fd57fea3016cf9ba9e8c5236 (patch)
treefd16d6f760e2695651df6783fb41a920f20b18f7
parentSupport =*/*-*9999* wildcard atom, bug #402197. (diff)
downloadportage-d134e60407c65b04fd57fea3016cf9ba9e8c5236.tar.gz
portage-d134e60407c65b04fd57fea3016cf9ba9e8c5236.tar.bz2
portage-d134e60407c65b04fd57fea3016cf9ba9e8c5236.zip
etc-update: fix --automode -5, bug #427068
-rwxr-xr-xbin/etc-update7
1 files changed, 7 insertions, 0 deletions
diff --git a/bin/etc-update b/bin/etc-update
index 1edc91fab..d763c1f73 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -190,6 +190,7 @@ parse_automode_flag() {
parse_automode_flag -3
export mv_opts=" ${mv_opts} "
mv_opts="${mv_opts// -i / }"
+ NONINTERACTIVE_MV=true
;;
-3)
input=0
@@ -600,6 +601,7 @@ declare title="Gentoo's etc-update tool!"
PREEN=false
SET_X=false
VERBOSE=false
+NONINTERACTIVE_MV=false
while [[ -n $1 ]] ; do
case $1 in
-d|--debug) SET_X=true;;
@@ -692,6 +694,11 @@ else
fi
fi
+if ${NONINTERACTIVE_MV} ; then
+ export mv_opts=" ${mv_opts} "
+ mv_opts="${mv_opts// -i / }"
+fi
+
if ${VERBOSE} ; then
for v in ${portage_vars[@]} ${cfg_vars[@]} TMP SCAN_PATHS ; do
echo "${v}=${!v}"