commit 302bb847d356a011f685542fc469f4c3e58b25fc
author John Budorick <jbudorick@chromium.org> Tue Jul 17 23:49:17 2018
committer Commit Bot <commit-bot@chromium.org> Tue Jul 17 23:49:17 2018
tree abc487fe0e5e8bac4fcd91cefbeed9f3881be9d0
parent a11fc9b2bd1e479ffa51cc885ba9c3c1a28d27c7

gclient: run cipd ensure in paranoid mode.

Bug: 860251
Change-Id: I0acaafcfe1d214d102b6a17b29b76aadcc1542c2
Reviewed-on: https://chromium-review.googlesource.com/1132345
Commit-Queue: John Budorick <jbudorick@chromium.org>
Reviewed-by: Vadim Shtayura <vadimsh@chromium.org>
Reviewed-by: Robbie Iannucci <iannucci@chromium.org>

gclient_scm.py

diff --git a/gclient_scm.py b/gclient_scm.py
index 0587304..76b1fb5 100644
--- a/gclient_scm.py
+++ b/gclient_scm.py
@@ -1343,6 +1343,7 @@
       ensure_file = None
       with tempfile.NamedTemporaryFile(
           suffix='.ensure', delete=False) as ensure_file:
+        ensure_file.write('$ParanoidMode CheckPresence\n\n')
         for subdir, packages in sorted(self._packages_by_subdir.iteritems()):
           ensure_file.write('@Subdir %s\n' % subdir)
           for package in sorted(packages, key=lambda p: p.name):

tests/gclient_smoketest.py

diff --git a/tests/gclient_smoketest.py b/tests/gclient_smoketest.py
index f95b6d7..c12fef4 100755
--- a/tests/gclient_smoketest.py
+++ b/tests/gclient_smoketest.py
@@ -1801,6 +1801,8 @@
       contents = f.read()
 
     self.assertEqual([
+        '$ParanoidMode CheckPresence',
+        '',
         '@Subdir src/another_cipd_dep',
         'package1 1.1-cr0',
         'package2 1.13',