commit b9be065ac1a1506571432fdf4a672d1bcd9a2a25
author maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Oct 14 18:05:40 2011 +0000
committer maruel@chromium.org <maruel@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Fri Oct 14 18:05:40 2011 +0000
tree cf0f648a0fbffca45523b0eb2045953979250def
parent 69392e7ca7ba581e6e892d0b8a40fa028111f89c

Do not sort solutions anymore, only dependencies specified in DEPS files.

Otherwise it breaks naked --revision usage. One example issue is linux_chromeos
applying the revision to cros_deps instead of src.

TBR=dpranke@chromium.org
BUG=100335
TEST=


Review URL: http://codereview.chromium.org/8298002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@105522 0039d316-1c4b-4281-b951-d872f2087c98

gclient.py

diff --git a/gclient.py b/gclient.py
index 27d2ed1..2fd056f 100644
--- a/gclient.py
+++ b/gclient.py
@@ -465,12 +465,13 @@
       deps_to_add.append(Dependency(
           self, name, url, None, None, None, None,
           self.deps_file, should_process))
+    deps_to_add.sort(key=lambda x: x.name)
     self.add_dependencies_and_close(deps_to_add, local_scope.get('hooks', []))
     logging.info('ParseDepsFile(%s) done' % self.name)
 
   def add_dependencies_and_close(self, deps_to_add, hooks):
     """Adds the dependencies, hooks and mark the parsing as done."""
-    for dep in sorted(deps_to_add, key=lambda x: x.name):
+    for dep in deps_to_add:
       if dep.verify_validity():
         self.add_dependency(dep)
     self._mark_as_parsed(hooks)