Commit defec8e6 authored by maruel@chromium.org's avatar maruel@chromium.org

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
parent 861fd0fe
......@@ -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, '
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment