[gentoo-commits] proj/portage:master commit in: repoman/pym/repoman/

[Zac Medico]

commit:     ef33db45a0c1d462411d4ced1857a322c0ab28f6
Author:     Zac Medico <zmedico <AT> gentoo <DOT> org>
AuthorDate: Fri Jun 24 06:22:41 2016 +0000
Commit:     Zac Medico <zmedico <AT> gentoo <DOT> org>
CommitDate: Fri Jun 24 06:29:07 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=ef33db45

repoman: skip QA checks in manifest mode (bug 586864)

The relevent Scanner loop control logic broke in commit 4062c69dc27a
because it was relying on the return value from the Manifest module's
"check" method.

Fixes: 4062c69dc27a ("repoman: Move manifest generation to 
modules/commit/manifest.py")
X-Gentoo-Bug: 586864
X-Gentoo-Bug-url: https://bugs.gentoo.org/show_bug.cgi?id=586864

 repoman/pym/repoman/scanner.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/repoman/pym/repoman/scanner.py b/repoman/pym/repoman/scanner.py
index d7cd81f..8999751 100644
--- a/repoman/pym/repoman/scanner.py
+++ b/repoman/pym/repoman/scanner.py
@@ -294,6 +294,8 @@ class Scanner(object):
 
                        if self.generate_manifest:
                                
manifest.Manifest(**self.kwargs).update_manifest(checkdir)
+                               if self.options.mode == 'manifest':
+                                       continue
                        checkdirlist = os.listdir(checkdir)
 
                        dynamic_data = {