From 4f27802b5c6e1abfb6809006763149456496a3db Mon Sep 17 00:00:00 2001
From: Andrii Shyshkalov <tandrii@chromium.org>
Date: Tue, 23 May 2017 08:53:50 +0000
Subject: [PATCH] Revert "gclient validate: allow None in deps_os values"
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 568e5919442f1dd3a2b160dbe998d1f1489a09c9.

Reason for revert: maybe caused outage

Original change's description:
> gclient validate: allow None in deps_os values
>
> Bug: 722206
> Change-Id: I15024670e481c166ca34a2ec8dac93c739684121
> Reviewed-on: https://chromium-review.googlesource.com/509537
> Reviewed-by: Dirk Pranke <dpranke@chromium.org>
> Commit-Queue: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
>

TBR=phajdan.jr@chromium.org,dpranke@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
Bug: 722206

Change-Id: Ia0f3825d204e65575020d108873dee82da47a1e6
Reviewed-on: https://chromium-review.googlesource.com/512345
Reviewed-by: Andrii Shyshkalov <tandrii@chromium.org>
Commit-Queue: Andrii Shyshkalov <tandrii@chromium.org>
---
 gclient_eval.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/gclient_eval.py b/gclient_eval.py
index ff13b97d8..3154e27b5 100644
--- a/gclient_eval.py
+++ b/gclient_eval.py
@@ -40,9 +40,7 @@ _GCLIENT_SCHEMA = schema.Schema({
     schema.Optional('deps'): {schema.Optional(basestring): basestring},
 
     # Similar to 'deps' (see above) - also keyed by OS (e.g. 'linux').
-    schema.Optional('deps_os'): {
-        basestring: {basestring: schema.Or(basestring, None)}
-    },
+    schema.Optional('deps_os'): {basestring: {basestring: basestring}},
 
     # Hooks executed after gclient sync (unless suppressed), or explicitly
     # on gclient hooks. See _GCLIENT_HOOKS_SCHEMA for details.