From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 13 Aug 2006 05:19:18 +0000 (-0000)
Subject: For consistent results, sort the contents when generating the info directory index... 
X-Git-Tag: v2.1.1~71
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ac83cade5511ab84e2ce96e7204347c01d23886d;p=portage.git

For consistent results, sort the contents when generating the info directory index.  See bug #142652.

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

diff --git a/bin/emerge b/bin/emerge
index 4a0cd5511..0c832e2a7 100755
--- a/bin/emerge
+++ b/bin/emerge
@@ -2417,7 +2417,9 @@ def chk_updated_info_files(root, infodirs, prev_mtimes, retval):
 				if not os.path.isdir(inforoot):
 					continue
 				errmsg = ""
-				for x in os.listdir(inforoot):
+				file_list = os.listdir(inforoot)
+				file_list.sort()
+				for x in file_list:
 					if (x[0] == ".") or (x in ["dir","dir.old"]) or (os.path.isdir(inforoot+"/"+x)):
 						continue
 					myso=commands.getstatusoutput("LANG=C LANGUAGE=C /usr/bin/install-info --dir-file="+inforoot+"/dir "+inforoot+"/"+x)[1]