diff options
Diffstat (limited to 'main.py')
| -rwxr-xr-x | main.py | 7 |
1 files changed, 4 insertions, 3 deletions
| @@ -39,7 +39,7 @@ from color import SetDefaultColoring | |||
| 39 | import event_log | 39 | import event_log |
| 40 | from repo_trace import SetTrace | 40 | from repo_trace import SetTrace |
| 41 | from git_command import user_agent | 41 | from git_command import user_agent |
| 42 | from git_config import init_ssh, close_ssh, RepoConfig | 42 | from git_config import RepoConfig |
| 43 | from git_trace2_event_log import EventLog | 43 | from git_trace2_event_log import EventLog |
| 44 | from command import InteractiveCommand | 44 | from command import InteractiveCommand |
| 45 | from command import MirrorSafeCommand | 45 | from command import MirrorSafeCommand |
| @@ -56,6 +56,7 @@ from error import RepoChangedException | |||
| 56 | import gitc_utils | 56 | import gitc_utils |
| 57 | from manifest_xml import GitcClient, RepoClient | 57 | from manifest_xml import GitcClient, RepoClient |
| 58 | from pager import RunPager, TerminatePager | 58 | from pager import RunPager, TerminatePager |
| 59 | import ssh | ||
| 59 | from wrapper import WrapperPath, Wrapper | 60 | from wrapper import WrapperPath, Wrapper |
| 60 | 61 | ||
| 61 | from subcmds import all_commands | 62 | from subcmds import all_commands |
| @@ -592,7 +593,7 @@ def _Main(argv): | |||
| 592 | repo = _Repo(opt.repodir) | 593 | repo = _Repo(opt.repodir) |
| 593 | try: | 594 | try: |
| 594 | try: | 595 | try: |
| 595 | init_ssh() | 596 | ssh.init() |
| 596 | init_http() | 597 | init_http() |
| 597 | name, gopts, argv = repo._ParseArgs(argv) | 598 | name, gopts, argv = repo._ParseArgs(argv) |
| 598 | run = lambda: repo._Run(name, gopts, argv) or 0 | 599 | run = lambda: repo._Run(name, gopts, argv) or 0 |
| @@ -604,7 +605,7 @@ def _Main(argv): | |||
| 604 | else: | 605 | else: |
| 605 | result = run() | 606 | result = run() |
| 606 | finally: | 607 | finally: |
| 607 | close_ssh() | 608 | ssh.close() |
| 608 | except KeyboardInterrupt: | 609 | except KeyboardInterrupt: |
| 609 | print('aborted by user', file=sys.stderr) | 610 | print('aborted by user', file=sys.stderr) |
| 610 | result = 1 | 611 | result = 1 |
