diff options
| author | Shawn O. Pearce <sop@google.com> | 2012-10-26 12:27:36 -0700 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2012-10-26 12:27:36 -0700 |
| commit | 2fe99e8820a84f545ad45d53921dc94b8bc9d4f3 (patch) | |
| tree | 2f5707377de43d2eef4ae7cbc3c47cfeefccbbff | |
| parent | bed45f940072e6383bf219bc315a65692e93d682 (diff) | |
| parent | 80d2ceb22267b7dc61b107934ff5264b6439a785 (diff) | |
| download | git-repo-2fe99e8820a84f545ad45d53921dc94b8bc9d4f3.tar.gz | |
Merge "repo selfupdate: Fix _PostRepoUpgrade takes 2 arguments"
| -rw-r--r-- | subcmds/sync.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/subcmds/sync.py b/subcmds/sync.py index a7df7c89..7416f4c3 100644 --- a/subcmds/sync.py +++ b/subcmds/sync.py | |||
| @@ -538,7 +538,7 @@ uncommitted changes are present' % project.relpath | |||
| 538 | mp.PreSync() | 538 | mp.PreSync() |
| 539 | 539 | ||
| 540 | if opt.repo_upgraded: | 540 | if opt.repo_upgraded: |
| 541 | _PostRepoUpgrade(self.manifest, opt) | 541 | _PostRepoUpgrade(self.manifest, quiet=opt.quiet) |
| 542 | 542 | ||
| 543 | if not opt.local_only: | 543 | if not opt.local_only: |
| 544 | mp.Sync_NetworkHalf(quiet=opt.quiet, | 544 | mp.Sync_NetworkHalf(quiet=opt.quiet, |
| @@ -612,10 +612,10 @@ uncommitted changes are present' % project.relpath | |||
| 612 | if self.manifest.notice: | 612 | if self.manifest.notice: |
| 613 | print self.manifest.notice | 613 | print self.manifest.notice |
| 614 | 614 | ||
| 615 | def _PostRepoUpgrade(manifest, opt): | 615 | def _PostRepoUpgrade(manifest, quiet=False): |
| 616 | wrapper = WrapperModule() | 616 | wrapper = WrapperModule() |
| 617 | if wrapper.NeedSetupGnuPG(): | 617 | if wrapper.NeedSetupGnuPG(): |
| 618 | wrapper.SetupGnuPG(opt.quiet) | 618 | wrapper.SetupGnuPG(quiet) |
| 619 | for project in manifest.projects.values(): | 619 | for project in manifest.projects.values(): |
| 620 | if project.Exists: | 620 | if project.Exists: |
| 621 | project.PostRepoUpgrade() | 621 | project.PostRepoUpgrade() |
