Merge "repo selfupdate: Fix _PostRepoUpgrade takes 2 arguments"

This commit is contained in:
Shawn O. Pearce 2012-10-26 12:27:36 -07:00 committed by Gerrit Code Review
commit 2fe99e8820

View File

@ -538,7 +538,7 @@ uncommitted changes are present' % project.relpath
mp.PreSync() mp.PreSync()
if opt.repo_upgraded: if opt.repo_upgraded:
_PostRepoUpgrade(self.manifest, opt) _PostRepoUpgrade(self.manifest, quiet=opt.quiet)
if not opt.local_only: if not opt.local_only:
mp.Sync_NetworkHalf(quiet=opt.quiet, mp.Sync_NetworkHalf(quiet=opt.quiet,
@ -612,10 +612,10 @@ uncommitted changes are present' % project.relpath
if self.manifest.notice: if self.manifest.notice:
print self.manifest.notice print self.manifest.notice
def _PostRepoUpgrade(manifest, opt): def _PostRepoUpgrade(manifest, quiet=False):
wrapper = WrapperModule() wrapper = WrapperModule()
if wrapper.NeedSetupGnuPG(): if wrapper.NeedSetupGnuPG():
wrapper.SetupGnuPG(opt.quiet) wrapper.SetupGnuPG(quiet)
for project in manifest.projects.values(): for project in manifest.projects.values():
if project.Exists: if project.Exists:
project.PostRepoUpgrade() project.PostRepoUpgrade()