diff options
author | Conley Owens <cco3@android.com> | 2014-01-30 15:09:59 -0800 |
---|---|---|
committer | Conley Owens <cco3@android.com> | 2014-01-30 15:17:09 -0800 |
commit | 094cdbe090a18c35fdcfb463435d793cc0239e83 (patch) | |
tree | e664b3febe4d8da1161b9e8e8ecc3a825b42aaa1 /subcmds | |
parent | 148a84de0ca7f828564f80cbe2bace33f295e65f (diff) | |
download | git-repo-094cdbe090a18c35fdcfb463435d793cc0239e83.tar.gz |
Add wrapper module
This takes the wrapper importing code from main.py and moves it into
its own module so that other modules may import it without causing
circular imports with main.py.
Change-Id: I9402950573933ed6f14ce0bfb600f74f32727705
Diffstat (limited to 'subcmds')
-rw-r--r-- | subcmds/sync.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index e138be05..27c8c728 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
@@ -58,13 +58,13 @@ except ImportError: | |||
58 | 58 | ||
59 | from git_command import GIT, git_require | 59 | from git_command import GIT, git_require |
60 | from git_refs import R_HEADS, HEAD | 60 | from git_refs import R_HEADS, HEAD |
61 | from main import WrapperModule | ||
62 | from project import Project | 61 | from project import Project |
63 | from project import RemoteSpec | 62 | from project import RemoteSpec |
64 | from command import Command, MirrorSafeCommand | 63 | from command import Command, MirrorSafeCommand |
65 | from error import RepoChangedException, GitError, ManifestParseError | 64 | from error import RepoChangedException, GitError, ManifestParseError |
66 | from project import SyncBuffer | 65 | from project import SyncBuffer |
67 | from progress import Progress | 66 | from progress import Progress |
67 | from wrapper import Wrapper | ||
68 | 68 | ||
69 | _ONE_DAY_S = 24 * 60 * 60 | 69 | _ONE_DAY_S = 24 * 60 * 60 |
70 | 70 | ||
@@ -699,7 +699,7 @@ later is required to fix a server side protocol bug. | |||
699 | print(self.manifest.notice) | 699 | print(self.manifest.notice) |
700 | 700 | ||
701 | def _PostRepoUpgrade(manifest, quiet=False): | 701 | def _PostRepoUpgrade(manifest, quiet=False): |
702 | wrapper = WrapperModule() | 702 | wrapper = Wrapper() |
703 | if wrapper.NeedSetupGnuPG(): | 703 | if wrapper.NeedSetupGnuPG(): |
704 | wrapper.SetupGnuPG(quiet) | 704 | wrapper.SetupGnuPG(quiet) |
705 | for project in manifest.projects: | 705 | for project in manifest.projects: |