Prechádzať zdrojové kódy

Merge "repo selfupdate: Fix _PostRepoUpgrade takes 2 arguments"

Shawn O. Pearce 13 rokov pred
rodič
commit
2fe99e8820
1 zmenil súbory, kde vykonal 3 pridanie a 3 odobranie
  1. 3 3
      subcmds/sync.py

+ 3 - 3
subcmds/sync.py

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