Don't sort dependencies by name anymore since it can be an issue for some kind of DEPS setup.

PageSpeed is an example of such ordering dependency.

TBR=bradnelson

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@53377 0039d316-1c4b-4281-b951-d872f2087c98
experimental/szager/collated-output
maruel@chromium.org 15 years ago
parent df2b31582f
commit cefc9d9113

@ -289,8 +289,6 @@ class Dependency(GClientKeywords):
if name in [s.name for s in self.dependencies]: if name in [s.name for s in self.dependencies]:
raise raise
self.dependencies.append(Dependency(self, name, url)) self.dependencies.append(Dependency(self, name, url))
# Sort by name.
self.dependencies.sort(key=lambda x: x.name)
logging.info('Loaded: %s' % str(self)) logging.info('Loaded: %s' % str(self))
def RunCommandRecursively(self, options, revision_overrides, def RunCommandRecursively(self, options, revision_overrides,

@ -373,16 +373,19 @@ class GClientSmokeSVN(GClientSmokeBase):
# So verify it works with --verbose. # So verify it works with --verbose.
out = self.parseGclient(['status', '--deps', 'mac', '--verbose'], out = self.parseGclient(['status', '--deps', 'mac', '--verbose'],
[['running', join(self.root_dir, 'src')], [['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', 'third_party', 'fpp')],
['running', join(self.root_dir, 'src', 'other')],
['running', join(self.root_dir, 'src', 'third_party', 'prout')]]) ['running', join(self.root_dir, 'src', 'third_party', 'prout')]])
out = self.svnBlockCleanup(out) out = self.svnBlockCleanup(out)
self.checkString('other', out[0][1]) self.checkString('other', out[0][1])
self.checkString(join('third_party', 'fpp'), out[0][2]) self.checkString(join('third_party', 'fpp'), out[0][2])
self.checkString(join('third_party', 'prout'), out[0][3]) 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(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 # Revert implies --force implies running hooks without looking at pattern
# matching. # matching.

Loading…
Cancel
Save