commit 52f1e5d9111c586624de48b5f705e10b67d109b3
author David Pursehouse <david.pursehouse@sonymobile.com> Wed Nov 14 04:53:24 2012 +0900
committer David Pursehouse <david.pursehouse@sonymobile.com> Wed Nov 14 05:05:32 2012 +0900
tree 64861a0d67e6194626a5fa8cd1c8d044bd353e1b
parent 8e3d355d448671e7c9b3409a3bbde971f90d7c28

Make load order of local manifests deterministic

Local manifest files stored in the local_manifests folder are loaded
in alphabetical order, so it's easier to know in which order project
removals/additions/modifications will be applied.

If local_manifests.xml exists, it will be loaded before the files in
local_manifests.

Change-Id: Ia5c0349608f1823b4662cd6b340b99915bd973d5

manifest_xml.py

diff --git a/manifest_xml.py b/manifest_xml.py
index a3e78fe..3198724 100644
--- a/manifest_xml.py
+++ b/manifest_xml.py
@@ -312,7 +312,7 @@
 
       local_dir = os.path.abspath(os.path.join(self.repodir, LOCAL_MANIFESTS_DIR_NAME))
       try:
-        for local_file in os.listdir(local_dir):
+        for local_file in sorted(os.listdir(local_dir)):
           if local_file.endswith('.xml'):
             try:
               nodes.append(self._ParseManifestXml(local_file, self.repodir))