From 05bcb89b7e06802e19e184b322d1ddd357502ce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Hajdan=2C=20Jr?= Date: Thu, 10 Aug 2017 14:21:26 +0200 Subject: [PATCH] gclient flatten: preserve vars in pinned deps MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bug: 570091 Change-Id: I8c450da68fd36d166f8f838c645672fce7c03891 Reviewed-on: https://chromium-review.googlesource.com/610004 Reviewed-by: Michael Moss Reviewed-by: Dirk Pranke Commit-Queue: Paweł Hajdan Jr. --- gclient.py | 5 +++-- tests/gclient_smoketest.py | 6 ++---- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/gclient.py b/gclient.py index 9e3ed8115..e46556ed0 100755 --- a/gclient.py +++ b/gclient.py @@ -1739,8 +1739,9 @@ class Flattener(object): continue scm = gclient_scm.CreateSCM( dep.parsed_url, self._client.root_dir, dep.name, dep.outbuf) - dep._parsed_url = dep._raw_url = dep._url = '%s@%s' % ( - url, scm.revinfo(self._client._options, [], None)) + revinfo = scm.revinfo(self._client._options, [], None) + dep._parsed_url = dep._url = '%s@%s' % (url, revinfo) + dep._raw_url = '%s@%s' % (dep._raw_url, revinfo) self._deps_string = '\n'.join( _GNSettingsToLines( diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py index 87cda0172..98807813e 100755 --- a/tests/gclient_smoketest.py +++ b/tests/gclient_smoketest.py @@ -744,8 +744,7 @@ class GClientSmokeGIT(GClientSmokeBase): 'deps = {', ' # src -> src/repo2 -> foo/bar', ' "foo/bar": {', - ' "url": "git://127.0.0.1:20000/git/repo_3@%s",' % ( - self.githash('repo_3', 2)), + ' "url": "/repo_3@%s",' % (self.githash('repo_3', 2)), ' },', '', ' # src', @@ -769,8 +768,7 @@ class GClientSmokeGIT(GClientSmokeBase): '', ' # src -> src/repo8', ' "src/repo8": {', - ' "url": "git://127.0.0.1:20000/git/repo_8@%s",' % ( - self.githash('repo_8', 1)), + ' "url": "/repo_8@%s",' % (self.githash('repo_8', 1)), ' },', '', '}',