From: Mike Frysinger <vapier@gentoo.org>
Date: Sun, 28 Jun 2009 16:12:28 +0000 (-0000)
Subject: make sure etc-update sorts updates in the order (1) leading dir path (2) filename... 
X-Git-Tag: v2.2_rc34~135
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=06a37a97b6963b0ee68740bac08501dc467801da;p=portage.git

make sure etc-update sorts updates in the order (1) leading dir path (2) filename (3) cfg update

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

diff --git a/bin/etc-update b/bin/etc-update
index d84907cb7..03fef8d18 100755
--- a/bin/etc-update
+++ b/bin/etc-update
@@ -63,8 +63,8 @@ scan() {
 		# The below set -f turns off file name globbing in the ${find_opts} expansion.
 		for file in $(set -f ; find ${path}/ ${find_opts} \
 		       ! -name '.*~' ! -iname '.*.bak' -print |
-			   sed -e "s:\(^.*/\)\(\._cfg[0-9]*_\)\(.*$\):\1\2\3\%\2\%\3:" |
-			   sort -t'%' -k3 -k2 | LANG=POSIX LC_ALL=POSIX cut -f1 -d'%'); do
+			   sed -e "s:\(^.*/\)\(\._cfg[0-9]*_\)\(.*$\):\1\2\3\%\1%\2\%\3:" |
+			   sort -t'%' -k2,2 -k4,4 -k3,3 | LANG=POSIX LC_ALL=POSIX cut -f1 -d'%'); do
 
 			rpath=$(echo "${file/\/\///}" | sed -e "s:/[^/]*$::")
 			rfile=$(echo "${file/\/\///}" | sed -e "s:^.*/::")