From 1101645d533f44d3fe650d1635fa4bbe2b6eb716 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Hajdan=2C=20Jr?= <phajdan.jr@chromium.org>
Date: Mon, 29 May 2017 18:02:15 +0200
Subject: [PATCH] gclient: fix assertion crash when a dep is set to None
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This is a follow-up after https://chromium-review.googlesource.com/c/517049/

Bug: 727334, 570091
Change-Id: I49f9ad07f1b79cba547d88e93b2d2064c33e1f4b
Reviewed-on: https://chromium-review.googlesource.com/518125
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
---
 gclient.py                    |  2 ++
 testing_support/fake_repos.py | 11 +++++++++++
 2 files changed, 13 insertions(+)

diff --git a/gclient.py b/gclient.py
index f861ed930a..f1fa9b53e4 100755
--- a/gclient.py
+++ b/gclient.py
@@ -651,6 +651,8 @@ class Dependency(gclient_utils.WorkItem, DependencySettings):
         ent = self.recursedeps.get(name)
         if ent is not None:
           deps_file = ent['deps_file']
+      if dep_value is None:
+        continue
       if isinstance(dep_value, basestring):
         url = dep_value
       else:
diff --git a/testing_support/fake_repos.py b/testing_support/fake_repos.py
index 899114c001..764d85cec1 100755
--- a/testing_support/fake_repos.py
+++ b/testing_support/fake_repos.py
@@ -451,6 +451,17 @@ deps = {
     'url': '%(git_base)srepo_2@%(hash)s',
   },
 }
+deps_os ={
+  'mac': {
+    'src/none_repo': None,
+  },
+  'unix': {
+    'src/none_repo': None,
+  },
+  'win': {
+    'src/none_repo': None,
+  },
+}
 hooks = [
   {
     'pattern': '.',