ec2 land doesn't kill instance when update-sourcecode fails

[Jonathan Lange]

I just ran ec2 land. It ended with the following traceback and left the instance running...

ec2test@i-a575d6cd$ /var/launchpad/test/utilities/update-sourcecode /var/launchpad/sourcecode
Sourcecode: /var/launchpad/sourcecode
Config: /var/launchpad/test/utilities/sourcedeps.conf
Traceback (most recent call last):
  File "/var/launchpad/test/utilities/update-sourcecode", line 18, in <module>
    sys.exit(sourcecode.main(sys.argv))
  File "/var/launchpad/test/lib/devscripts/sourcecode.py", line 223, in main
    options.public_only, options.dry_run)
  File "/var/launchpad/test/lib/devscripts/sourcecode.py", line 182, in update_sourcecode
    get_branches(sourcecode_directory, new, possible_transports)
  File "/var/launchpad/test/lib/devscripts/sourcecode.py", line 109, in get_branches
    branch_url, possible_transports=possible_transports)
  File "/usr/lib/python2.5/site-packages/bzrlib/branch.py", line 168, in open
    possible_transports=possible_transports)
  File "/usr/lib/python2.5/site-packages/bzrlib/bzrdir.py", line 843, in open
    t = get_transport(base, possible_transports=possible_transports)
  File "/usr/lib/python2.5/site-packages/bzrlib/lazy_import.py", line 125, in __call__
    return obj(*args, **kwargs)
  File "/usr/lib/python2.5/site-packages/bzrlib/transport/__init__.py", line 1553, in get_transport
    base = directories.dereference(base)
  File "/usr/lib/python2.5/site-packages/bzrlib/directory_service.py", line 58, in dereference
    return service().look_up(name, url)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad/lp_directory.py", line 60, in look_up
    return self._resolve(url)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad/lp_directory.py", line 76, in _resolve
    result = resolve.submit(service)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad/lp_registration.py", line 239, in submit
    self._authenticated)
  File "/usr/lib/python2.5/site-packages/bzrlib/plugins/launchpad/lp_registration.py", line 166, in send_request
    result = method(*method_params)
  File "/usr/lib/python2.5/xmlrpclib.py", line 1147, in __call__
    return self.__send(self.__name, args)
  File "/usr/lib/python2.5/xmlrpclib.py", line 1437, in __request
    verbose=self.__verbose
  File "/usr/lib/python2.5/xmlrpclib.py", line 1183, in request
    self.send_content(h, request_body)
  File "/usr/lib/python2.5/xmlrpclib.py", line 1297, in send_content
    connection.endheaders()
  File "/usr/lib/python2.5/httplib.py", line 860, in endheaders
    self._send_output()
  File "/usr/lib/python2.5/httplib.py", line 732, in _send_output
    self.send(msg)
  File "/usr/lib/python2.5/httplib.py", line 699, in send
    self.connect()
  File "/usr/lib/python2.5/httplib.py", line 1134, in connect
    sock.connect((self.host, self.port))
  File "<string>", line 1, in connect
socket.error: (110, 'Connection timed out')
Traceback (most recent call last):
  File "./lib/devscripts/ec2test/instance.py", line 393, in set_up_and_run
    return func(*args, **kw)
  File "./lib/devscripts/ec2test/testrunner.py", line 451, in run_tests
    self.prepare_tests()
  File "./lib/devscripts/ec2test/testrunner.py", line 357, in prepare_tests
    "/var/launchpad/test/utilities/update-sourcecode "
  File "./lib/devscripts/ec2test/instance.py", line 617, in run_with_ssh_agent
    raise RuntimeError('Command failed: %s' % (cmd,))
RuntimeError: Command failed: /var/launchpad/test/utilities/update-sourcecode /var/launchpad/sourcecode
No handlers could be found for logger "bzr"

[Michael Hudson-Doyle (mwhudson)]

Oops, just found the cause for this...