Fix a specific failure when reverting embedded directories.

gclient_scm.py

 # Copyright 2009 Google Inc.  All Rights Reserved.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #      http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 352 matching lines @@
           os.remove(file_path)
         elif os.path.isdir(file_path):
           logging.info('gclient_utils.RemoveDirectory(%s)' % file_path)
           gclient_utils.RemoveDirectory(file_path)
         else:
           logging.error('no idea what is %s.\nYou just found a bug in gclient'
                         ', please ping maruel@chromium.org ASAP!' % file_path)
       except EnvironmentError:
         logging.error('Failed to remove %s.' % file_path)
 
-    # svn revert is so broken we don't even use it. Using
-    # "svn up --revision BASE" achieve the same effect.
-    RunSVNAndGetFileList(options, ['update', '--revision', 'BASE'], path, 
-                         file_list)
+    try:
+      # svn revert is so broken we don't even use it. Using
+      # "svn up --revision BASE" achieve the same effect.
+      RunSVNAndGetFileList(options, ['update', '--revision', 'BASE'], path,
+                           file_list)
+    except OSError, e:
+      # Maybe the directory disapeared meanwhile. We don't want it to throw an
+      # exception.
+      logging.error('Failed to update:\n%s' % str(e))
 
   def runhooks(self, options, args, file_list):
     self.status(options, args, file_list)
 
   def status(self, options, args, file_list):
     """Display status information."""
     path = os.path.join(self._root_dir, self.relpath)
     command = ['status']
     command.extend(args)
     if not os.path.isdir(path):
@@ skipping 306 matching lines @@
         # Col 3
         if wc_status[0].getAttribute('copied') == 'true':
           statuses[3] = '+'
         # Col 4
         if wc_status[0].getAttribute('switched') == 'true':
           statuses[4] = 'S'
         # TODO(maruel): Col 5 and 6
         item = (''.join(statuses), file)
         results.append(item)
   return results