diff --git a/gclient.py b/gclient.py index 42a6938dd..9a722f725 100644 --- a/gclient.py +++ b/gclient.py @@ -289,8 +289,6 @@ class Dependency(GClientKeywords): if name in [s.name for s in self.dependencies]: raise self.dependencies.append(Dependency(self, name, url)) - # Sort by name. - self.dependencies.sort(key=lambda x: x.name) logging.info('Loaded: %s' % str(self)) def RunCommandRecursively(self, options, revision_overrides, diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py index feaa3158d..2519a8e1a 100755 --- a/tests/gclient_smoketest.py +++ b/tests/gclient_smoketest.py @@ -373,16 +373,19 @@ class GClientSmokeSVN(GClientSmokeBase): # So verify it works with --verbose. out = self.parseGclient(['status', '--deps', 'mac', '--verbose'], [['running', join(self.root_dir, 'src')], - ['running', join(self.root_dir, 'src', 'other')], ['running', join(self.root_dir, 'src', 'third_party', 'fpp')], + ['running', join(self.root_dir, 'src', 'other')], ['running', join(self.root_dir, 'src', 'third_party', 'prout')]]) out = self.svnBlockCleanup(out) self.checkString('other', out[0][1]) self.checkString(join('third_party', 'fpp'), out[0][2]) self.checkString(join('third_party', 'prout'), out[0][3]) - self.checkString('hi', out[1][1]) + self.checkString('hi', out[2][1]) self.assertEquals(4, len(out[0])) - self.assertEquals(2, len(out[1])) + self.assertEquals(1, len(out[1])) + self.assertEquals(2, len(out[2])) + self.assertEquals(1, len(out[3])) + self.assertEquals(4, len(out)) # Revert implies --force implies running hooks without looking at pattern # matching.