summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2006-08-13 05:19:18 +0000
committerZac Medico <zmedico@gentoo.org>2006-08-13 05:19:18 +0000
commitac83cade5511ab84e2ce96e7204347c01d23886d (patch)
treeadce42849e4bb53d985abde43e79d8116a9c6c83
parent09d12dd2eb91ccd6c1b5dc3773bb1c7f3f22d3ef (diff)
downloadportage-ac83cade5511ab84e2ce96e7204347c01d23886d.tar.gz
portage-ac83cade5511ab84e2ce96e7204347c01d23886d.tar.bz2
portage-ac83cade5511ab84e2ce96e7204347c01d23886d.zip
For consistent results, sort the contents when generating the info directory index. See bug #142652.
svn path=/main/trunk/; revision=4239
-rwxr-xr-xbin/emerge4
1 files changed, 3 insertions, 1 deletions
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]