1
=== modified file 'lib/devscripts/ec2test/entrypoint.py'
2
--- lib/devscripts/ec2test/entrypoint.py	2009-12-23 02:26:54 +0000
3
+++ lib/devscripts/ec2test/entrypoint.py	2010-08-26 04:41:05 +0000
4
@@ -3,6 +3,8 @@
5
3
3
6
4
"""The entry point for the 'ec2' utility."""
4
"""The entry point for the 'ec2' utility."""
7
5
5
8
6
from __future__ import with_statement
9
7
10
6
__metaclass__ = type
8
__metaclass__ = type
11
7
__all__ = [
9
__all__ = [
12
8
    'main',
10
    'main',
13
@@ -12,8 +14,8 @@
14
12
import rlcompleter
14
import rlcompleter
15
13
import sys
15
import sys
16
14
16
17
17
import bzrlib
18
15
from bzrlib.errors import BzrCommandError
18
from bzrlib.errors import BzrCommandError
19
16
from bzrlib import ui
20
17
19
21
18
from devscripts.ec2test import builtins
20
from devscripts.ec2test import builtins
22
19
from devscripts.ec2test.controller import (
21
from devscripts.ec2test.controller import (
23
@@ -33,19 +35,15 @@
24
33
35
25
34
    We run the specified command, or give help if none was specified.
36
    We run the specified command, or give help if none was specified.
26
35
    """
37
    """
43
36
    # XXX MichaelHudson, 2009-12-23, bug=499637: run_bzr fails unless you set
38
    with bzrlib.initialize():
44
37
    # a ui_factory.
39
        controller = EC2CommandController()
45
38
    ui.ui_factory = ui.make_ui_for_terminal(
40
        controller.install_bzrlib_hooks()
46
39
        sys.stdin, sys.stdout, sys.stderr)
41
        controller.load_module(builtins)
47
40
42
48
41
    controller = EC2CommandController()
43
        args = sys.argv[1:]
49
42
    controller.install_bzrlib_hooks()
44
        if not args:
50
43
    controller.load_module(builtins)
45
            args = ['help']
51
44
46
        try:
52
45
    args = sys.argv[1:]
47
            controller.run(args)
53
46
    if not args:
48
        except BzrCommandError, e:
54
47
        args = ['help']
49
            sys.exit('ec2: ERROR: ' + str(e))
39
48
    try:
40
49
        controller.run(args)
41
50
    except BzrCommandError, e:
42
51
        sys.exit('ec2: ERROR: ' + str(e))
Reviewer	Review Type	Date Requested	Status
Tim Penhey (community)		2010-08-26	Approve on 2010-08-26
Review via email: mp+33730@code.launchpad.net