Force requirements modification to be locked.

gclient.py

 #!/usr/bin/env python
 # Copyright (c) 2011 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 246 matching lines @@
     self._processed = False
     # This dependency had its hook run
     self._hooks_ran = False
 
     # Setup self.requirements and find any other dependency who would have self
     # as a requirement.
 
     # self.parent is implicitly a requirement. This will be recursive by
     # definition.
     if self.parent and self.parent.name:
-      self._requirements.add(self.parent.name)
+      self.add_requirement(self.parent.name)
 
     # For a tree with at least 2 levels*, the leaf node needs to depend
     # on the level higher up in an orderly way.
     # This becomes messy for >2 depth as the DEPS file format is a dictionary,
     # thus unsorted, while the .gclient format is a list thus sorted.
     #
     # * _recursion_limit is hard coded 2 and there is no hope to change this
     # value.
     #
     # Interestingly enough, the following condition only works in the case we
     # want: self is a 2nd level node. 3nd level node wouldn't need this since
     # they already have their parent as a requirement.
     root_deps = self.root.dependencies
     if self.parent in root_deps:
       for i in root_deps:
         if i is self.parent:
           break
         if i.name:
-          self._requirements.add(i.name)
+          self.add_requirement(i.name)
 
     if isinstance(self.url, self.FromImpl):
-      self._requirements.add(self.url.module_name)
+      self.add_requirement(self.url.module_name)
 
     if self.name and self.should_process:
       for obj in self.root.depth_first_tree():
         if obj is self or not obj.name:
           continue
         # Step 1: Find any requirements self may need.
         if self.name.startswith(posixpath.join(obj.name, '')):
-          self._requirements.add(obj.name)
+          self.add_requirement(obj.name)
         # Step 2: Find any requirements self may impose.
         if obj.name.startswith(posixpath.join(self.name, '')):
-          try:
-            # Access to a protected member _requirements of a client class
-            # pylint: disable=W0212
-            obj.lock.acquire()
-            obj._requirements.add(self.name)
-          finally:
-            obj.lock.release()
+          obj.add_requirement(self.name)
 
     if not self.name and self.parent:
       raise gclient_utils.Error('Dependency without name')
 
   def LateOverride(self, url):
     """Resolves the parsed url from url.
 
     Manages From() keyword accordingly. Do not touch self.parsed_url nor
     self.url because it may called with other urls due to From()."""
     assert self.parsed_url == None or not self.should_process, self.parsed_url
@@ skipping 1136 matching lines @@
   except (gclient_utils.Error, subprocess2.CalledProcessError), e:
     print >> sys.stderr, 'Error: %s' % str(e)
     return 1
 
 
 if '__main__' == __name__:
   fix_encoding.fix_encoding()
   sys.exit(Main(sys.argv[1:]))
 
 # vim: ts=2:sw=2:tw=80:et: