|
|
@ -165,11 +165,13 @@ class Dependency(GClientKeywords):
|
|
|
|
# Sanity checks
|
|
|
|
# Sanity checks
|
|
|
|
if not self.name and self.parent:
|
|
|
|
if not self.name and self.parent:
|
|
|
|
raise gclient_utils.Error('Dependency without name')
|
|
|
|
raise gclient_utils.Error('Dependency without name')
|
|
|
|
tree = dict((d.name, d) for d in self.tree(False))
|
|
|
|
# TODO(maruel): http://crbug.com/50015 Reenable this check once
|
|
|
|
if self.name in tree:
|
|
|
|
# self.tree(False) is corrected.
|
|
|
|
raise gclient_utils.Error(
|
|
|
|
# tree = dict((d.name, d) for d in self.tree(False))
|
|
|
|
'Dependency %s specified more than once:\n %s\nvs\n %s' %
|
|
|
|
#if self.name in tree:
|
|
|
|
(self.name, tree[self.name].hierarchy(), self.hierarchy()))
|
|
|
|
# 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,
|
|
|
|
if not isinstance(self.url,
|
|
|
|
(basestring, self.FromImpl, self.FileImpl, None.__class__)):
|
|
|
|
(basestring, self.FromImpl, self.FileImpl, None.__class__)):
|
|
|
|
raise gclient_utils.Error('dependency url must be either a string, None, '
|
|
|
|
raise gclient_utils.Error('dependency url must be either a string, None, '
|
|
|
|