From 9a289023b5abb2b53c3918fabb3ccf183c2358d2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Pawe=C5=82=20Hajdan=2C=20Jr?= Date: Thu, 10 Aug 2017 16:04:24 +0200 Subject: [PATCH] gclient flatten: do not emit deps entries without a url MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Otherwise it'd get stringified to "None" and make resulting DEPS invalid. In theory we could properly serialize them to None, but it's simpler to just skip them, since they do not affect resulting checkout. Bug: 570091 Change-Id: Ica301e2d7e40ba4ed04527355d8f75a43456391c Reviewed-on: https://chromium-review.googlesource.com/610150 Reviewed-by: Michael Moss Reviewed-by: Dirk Pranke Commit-Queue: Paweł Hajdan Jr. --- gclient.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/gclient.py b/gclient.py index e46556ed08..4d6db765ad 100755 --- a/gclient.py +++ b/gclient.py @@ -1764,7 +1764,8 @@ class Flattener(object): """ assert dep.name not in self._deps or self._deps.get(dep.name) == dep, ( dep.name, self._deps.get(dep.name)) - self._deps[dep.name] = dep + if dep.url: + self._deps[dep.name] = dep def _flatten_dep(self, dep): """Visits a dependency in order to flatten it (see CMDflatten).