| Index: gclient.py
|
| diff --git a/gclient.py b/gclient.py
|
| index e6a6432f9a31baa4f05ecd82ba9094dc302e0fb0..fa86f2130db6703ebcdc2f693adff2b40c65bd43 100755
|
| --- a/gclient.py
|
| +++ b/gclient.py
|
| @@ -518,11 +518,6 @@ class GClient(object):
|
| solution_deps_content[solution["name"]],
|
| custom_vars)
|
|
|
| - local_scope = {}
|
| - var = self._VarImpl(custom_vars, local_scope)
|
| - global_scope = {"From": self.FromImpl, "Var": var.Lookup, "deps_os": {}}
|
| - exec(solution_deps_content[solution["name"]], global_scope, local_scope)
|
| -
|
| # If a line is in custom_deps, but not in the solution, we want to append
|
| # this line to the solution.
|
| if "custom_deps" in solution:
|
| @@ -560,10 +555,10 @@ class GClient(object):
|
| if path[0] != "/":
|
| raise gclient_utils.Error(
|
| "relative DEPS entry \"%s\" must begin with a slash" % d)
|
| - if local_scope.get('use_relative_urls2'):
|
| - url = gclient_utils.FullUrlFromRelative2(solution["url"], url)
|
| - else:
|
| - url = gclient_utils.FullUrlFromRelative(solution["url"], url)
|
| + # Create a scm just to query the full url.
|
| + scm = gclient_scm.CreateSCM(solution["url"], self._root_dir,
|
| + None)
|
| + url = scm.FullUrlForRelativeUrl(url)
|
| if d in deps and deps[d] != url:
|
| raise gclient_utils.Error(
|
| "Solutions have conflicting versions of dependency \"%s\"" % d)
|
|
|