Merging in latest boto.

boto/pyami/bootstrap.py

 # Copyright (c) 2006,2007 Mitch Garnaat http://garnaat.org/
 #
 # Permission is hereby granted, free of charge, to any person obtaining a
 # copy of this software and associated documentation files (the
 # "Software"), to deal in the Software without restriction, including
 # without limitation the rights to use, copy, modify, merge, publish, dis-
 # tribute, sublicense, and/or sell copies of the Software, and to permit
 # persons to whom the Software is furnished to do so, subject to the fol-
 # lowing conditions:
 #
 # The above copyright notice and this permission notice shall be included
 # in all copies or substantial portions of the Software.
 #
 # THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
 # OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABIL-
 # ITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT
 # SHALL THE AUTHOR BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, 
 # WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS
 # IN THE SOFTWARE.
 #
 import os
 import boto
 from boto.utils import get_instance_metadata, get_instance_userdata
 from boto.pyami.config import Config, BotoConfigPath
 from boto.pyami.scriptbase import ScriptBase
+import time
 
 class Bootstrap(ScriptBase):
     """
     The Bootstrap class is instantiated and run as part of the PyAMI
     instance initialization process.  The methods in this class will
     be run from the rc.local script of the instance and will be run
     as the root user.
 
     The main purpose of this class is to make sure the boto distribution
     on the instance is the one required.
@@ skipping 31 matching lines @@
         if update.startswith('svn'):
             if update.find(':') >= 0:
                 method, version = update.split(':')
                 version = '-r%s' % version
             else:
                 version = '-rHEAD'
             location = boto.config.get('Boto', 'boto_location', '/usr/local/boto')
             self.run('svn update %s %s' % (version, location))
         elif update.startswith('git'):
             location = boto.config.get('Boto', 'boto_location', '/usr/share/python-support/python-boto/boto')
-            self.run('git pull', cwd=location)
+            num_remaining_attempts = 10
+            while num_remaining_attempts > 0:
+                num_remaining_attempts -= 1
+                try:
+                    self.run('git pull', cwd=location)
+                    num_remaining_attempts = 0
+                except Exception, e:
+                    boto.log.info('git pull attempt failed with the following exception. Trying again in a bit. %s', e)
+                    time.sleep(2)
             if update.find(':') >= 0:
                 method, version = update.split(':')
             else:
                 version = 'master'
             self.run('git checkout %s' % version, cwd=location)
         else:
             # first remove the symlink needed when running from subversion
             self.run('rm /usr/local/lib/python2.5/site-packages/boto')
             self.run('easy_install %s' % update)
 
@@ skipping 27 matching lines @@
         self.load_boto()
         self.load_packages()
         self.notify('Bootstrap Completed for %s' % boto.config.get_instance('instance-id'))
 
 if __name__ == "__main__":
     # because bootstrap starts before any logging configuration can be loaded from
     # the boto config files, we will manually enable logging to /var/log/boto.log
     boto.set_file_logger('bootstrap', '/var/log/boto.log')
     bs = Bootstrap()
     bs.main()