From defec8e6898a77f31468744d724abacaa932bdf4 Mon Sep 17 00:00:00 2001 From: "maruel@chromium.org" Date: Fri, 23 Jul 2010 04:06:57 +0000 Subject: [PATCH] Disable the duplicate dependency check to get pagespeed back to sync. BUG=50015 TBR=bradnelson Review URL: http://codereview.chromium.org/3013031 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@53435 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient.py | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/gclient.py b/gclient.py index c3e696423..bf7b6ad6d 100644 --- a/gclient.py +++ b/gclient.py @@ -165,11 +165,13 @@ class Dependency(GClientKeywords): # Sanity checks if not self.name and self.parent: raise gclient_utils.Error('Dependency without name') - tree = dict((d.name, d) for d in self.tree(False)) - if self.name in tree: - raise gclient_utils.Error( - 'Dependency %s specified more than once:\n %s\nvs\n %s' % - (self.name, tree[self.name].hierarchy(), self.hierarchy())) + # TODO(maruel): http://crbug.com/50015 Reenable this check once + # self.tree(False) is corrected. + # tree = dict((d.name, d) for d in self.tree(False)) + #if self.name in tree: + # raise gclient_utils.Error( + # 'Dependency %s specified more than once:\n %s\nvs\n %s' % + # (self.name, tree[self.name].hierarchy(), self.hierarchy())) if not isinstance(self.url, (basestring, self.FromImpl, self.FileImpl, None.__class__)): raise gclient_utils.Error('dependency url must be either a string, None, '