commit 1c5c118cfd533f2242f95aafbf9aa275031e535a
author Bruce Dawson <brucedawson@chromium.org> Tue Jun 13 10:34:06 2017 -0700
committer Commit Bot <commit-bot@chromium.org> Wed Jun 14 17:02:01 2017 +0000
tree e83adccd794c55547f6ad0adaa184e24f9ccf398
parent f79f0da8c68eee72de38f5d0fdbe5faa4ea044f0

Clean up a confusing gclient_utils.py message

While setting up a Chromium repo on a new machine I ended up with a
missing .gclient_entries file. This triggered a warning message but it
led me in the wrong direction. I think that the new message - saying
exactly what problem was detected - will be slightly more helpful.

Change-Id: I8c91861f843e3d30881b1b4933a02ad966c114ef
Reviewed-on: https://chromium-review.googlesource.com/533314
Reviewed-by: Paweł Hajdan Jr. <phajdan.jr@chromium.org>
Commit-Queue: Bruce Dawson <brucedawson@chromium.org>

gclient_utils.py

diff --git a/gclient_utils.py b/gclient_utils.py
index e60c069..30306a7 100644
--- a/gclient_utils.py
+++ b/gclient_utils.py
@@ -613,8 +613,9 @@
       # might have failed. In that case, we cannot verify that the .gclient
       # is the one we want to use. In order to not to cause too much trouble,
       # just issue a warning and return the path anyway.
-      print >> sys.stderr, ("%s file in parent directory %s might not be the "
-          "file you want to use" % (filename, path))
+      print >> sys.stderr, ("%s missing, %s file in parent directory %s might "
+          "not be the file you want to use." %
+          (entries_filename, filename, path))
       return path
     scope = {}
     try: