Sort the hashes for manifest2 lines to that output is reproducible.

svn path=/main/trunk/; revision=3026

diff --git a/pym/portage_manifest.py b/pym/portage_manifest.py
index 0704bccc7ac20fe5324156de523c2a9e3133349c..eb6758d609cc6b063b434c2f3cfb803b99647102 100644 (file)
--- a/pym/portage_manifest.py
+++ b/pym/portage_manifest.py
@@ -200,14 +200,14 @@ class Manifest(object):
                                        f2 = f
                                myline = " ".join([t, f, str(self.fhashdict[t][f]["size"])])
                                myhashes = self.fhashdict[t][f]
-                               for h in myhashes.keys():
+                               myhashkeys = myhashes.keys()
+                               myhashkeys.sort()
+                               for h in myhashkeys:
                                        if h not in portage_const.MANIFEST2_HASH_FUNCTIONS:
                                                continue
                                        myline += " "+h+" "+str(myhashes[h])
                                mylines.append(myline)
                                if self.compat and t != "DIST":
-                                       myhashkeys = myhashes.keys()
-                                       myhashkeys.sort()
                                        for h in myhashkeys:
                                                if h not in portage_const.MANIFEST1_HASH_FUNCTIONS:
                                                        continue