From d9591f03f5a2a1cd89589b43e04569e2728695ae Mon Sep 17 00:00:00 2001 From: "rdsmith@chromium.org" Date: Wed, 5 Feb 2014 19:28:20 +0000 Subject: [PATCH] Warn if --gclientfile= specifies a with separators. Given that we search for the gclient root in ancestor directories based on the file name, specifying a file with separators doesn't make a lot of sense. BUG=336946 R=iannucci@chromium.org Review URL: https://codereview.chromium.org/150633004 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@249077 0039d316-1c4b-4281-b951-d872f2087c98 --- gclient.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/gclient.py b/gclient.py index d1b5a8733..e2491cef1 100755 --- a/gclient.py +++ b/gclient.py @@ -60,7 +60,7 @@ # the same as normal hooks, except that they run before the DEPS are # processed. Pre-DEPS run with "sync" and "revert" unless the --noprehooks # flag is used. -# +# # Specifying a target OS # An optional key named "target_os" may be added to a gclient file to specify # one or more additional operating systems that should be considered when @@ -1860,6 +1860,9 @@ class OptionParser(optparse.OptionParser): format='%(module)s(%(lineno)d) %(funcName)s:%(message)s') if options.config_filename and options.spec: self.error('Cannot specifiy both --gclientfile and --spec') + if (options.config_filename and + options.config_filename != os.path.basename(options.config_filename)): + self.error('--gclientfile target must be a filename, not a path') if not options.config_filename: options.config_filename = self.gclientfile_default options.entries_filename = options.config_filename + '_entries'