Fix custom_deps, hooks and custom_vars to be evaluated even if no DEPS file.

gclient.py

 #!/usr/bin/python
 # Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Meta checkout manager supporting both Subversion and GIT.
 
 Files
   .gclient      : Current client configuration, written by 'config' command.
                   Format is a Python script defining 'solutions', a list whose
@@ skipping 31 matching lines @@
                it will be removed from the list and the list will be extended
                by the list of matching files.
 
   Example:
     hooks = [
       { "pattern": "\\.(gif|jpe?g|pr0n|png)$",
         "action":  ["python", "image_indexer.py", "--all"]},
     ]
 """
 
-__version__ = "0.6"
+__version__ = "0.6.1"
 
 import copy
 import logging
 import optparse
 import os
 import posixpath
 import pprint
 import re
 import subprocess
 import sys
@@ skipping 184 matching lines @@
     else:
       raise gclient_utils.Error('Unkown url type')
 
   def ParseDepsFile(self):
     """Parses the DEPS file for this dependency."""
     assert self.processed == True
     if self.deps_parsed:
       logging.debug('%s was already parsed' % self.name)
       return
     self.deps_parsed = True
-    filepath = os.path.join(self.root_dir(), self.name, self.deps_file)
-    if not os.path.isfile(filepath):
-      logging.info('%s: No DEPS file found at %s' % (self.name, filepath))
-      return
-    deps_content = gclient_utils.FileRead(filepath)
-    logging.debug(deps_content)
-
-    # Eval the content.
     # One thing is unintuitive, vars= {} must happen before Var() use.
     local_scope = {}
     var = self.VarImpl(self.custom_vars, local_scope)
     global_scope = {
       'File': self.FileImpl,
       'From': self.FromImpl,
       'Var': var.Lookup,
       'deps_os': {},
     }
-    try:
-      exec(deps_content, global_scope, local_scope)
-    except SyntaxError, e:
-      gclient_utils.SyntaxErrorToError(filepath, e)
+    filepath = os.path.join(self.root_dir(), self.name, self.deps_file)
+    if not os.path.isfile(filepath):
+      logging.info('%s: No DEPS file found at %s' % (self.name, filepath))
+    else:
+      deps_content = gclient_utils.FileRead(filepath)
+      logging.debug(deps_content)
+      # Eval the content.
+      try:
+        exec(deps_content, global_scope, local_scope)
+      except SyntaxError, e:
+        gclient_utils.SyntaxErrorToError(filepath, e)
     deps = local_scope.get('deps', {})
     # load os specific dependencies if defined.  these dependencies may
     # override or extend the values defined by the 'deps' member.
     if 'deps_os' in local_scope:
       for deps_os_key in self.enforced_os():
         os_deps = local_scope['deps_os'].get(deps_os_key, {})
         if len(self.enforced_os()) > 1:
           # Ignore any conflict when including deps for more than one
-          # platform, so we collect the broadest set of dependencies available.
-          # We may end up with the wrong revision of something for our
-          # platform, but this is the best we can do.
+          # platform, so we collect the broadest set of dependencies
+          # available. We may end up with the wrong revision of something for
+          # our platform, but this is the best we can do.
           deps.update([x for x in os_deps.items() if not x[0] in deps])
         else:
           deps.update(os_deps)
 
     self.deps_hooks.extend(local_scope.get('hooks', []))
 
     # If a line is in custom_deps, but not in the solution, we want to append
     # this line to the solution.
     for d in self.custom_deps:
       if d not in deps:
@@ skipping 950 matching lines @@
     return CMDhelp(parser, argv)
   except gclient_utils.Error, e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: