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

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

[Brian Dolbec]

commit:     59014f2da612d09d0f969216e68cada91c19853d
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 14:21:23 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 14:21:23 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=59014f2d

repoman: Fix commit 8e7971169c2 missing self in func() parameters, bug 581594

Fixes hastily committed preceeding live vcs logic change.
X-Gentoo-bug: 581594
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=581594

Thank you: Coacher <itumaykin+gentoo <AT> gmail.com>

 pym/repoman/modules/scan/eclasses/live.py | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/pym/repoman/modules/scan/eclasses/live.py b/pym/repoman/modules/scan/eclasses/live.py
index 0036f10..a5b06ed 100644
--- a/pym/repoman/modules/scan/eclasses/live.py
+++ b/pym/repoman/modules/scan/eclasses/live.py
@@ -26,19 +26,27 @@ class LiveEclassChecks(ScanBase):
 		@param xpkg: Package in which we check (string).
 		@param ebuild: Ebuild which we check (object).
 		@param y_ebuild: Ebuild which we check (string).
-		@returns: dictionary
+		@returns: boolean
 		'''
 		pkg = kwargs.get("pkg").result()
 		package = kwargs.get('xpkg')
 		ebuild = kwargs.get('ebuild').get()
 		y_ebuild = kwargs.get('y_ebuild')
-		keywords = ebuild.keywords
 
 		if ebuild.live_ebuild and self.repo_settings.repo_config.name == "gentoo":
 			return self.check_live(pkg, package, ebuild, y_ebuild)
 		return False
 
-	def check_live(pkg, package, ebuild, y_ebuild):
+	def check_live(self, pkg, package, ebuild, y_ebuild):
+		'''Perform the live vcs check
+
+		@param pkg: Package in which we check (object).
+		@param xpkg: Package in which we check (string).
+		@param ebuild: Ebuild which we check (object).
+		@param y_ebuild: Ebuild which we check (string).
+		@returns: boolean
+		'''
+		keywords = ebuild.keywords
 		is_stable = lambda kw: not kw.startswith("~") and not kw.startswith("-")
 		bad_stable_keywords = list(filter(is_stable, keywords))
 

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

[Brian Dolbec]

commit:     a2ee8a9a3c25723f0501286adee8e42a4f323aca
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 16:15:31 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 16:15:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a2ee8a9a

repoman/modules/.../live.py: Fix space error in qa message

 pym/repoman/modules/scan/eclasses/live.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/repoman/modules/scan/eclasses/live.py b/pym/repoman/modules/scan/eclasses/live.py
index a5b06ed..dca10b5 100644
--- a/pym/repoman/modules/scan/eclasses/live.py
+++ b/pym/repoman/modules/scan/eclasses/live.py
@@ -52,7 +52,7 @@ class LiveEclassChecks(ScanBase):
 
 		if bad_stable_keywords:
 			self.qatracker.add_error(
-				"LIVEVCS.stable", "%s/%s.ebuild with stable keywords :%s" % (
+				"LIVEVCS.stable", "%s/%s.ebuild with stable keywords: %s" % (
 					package, y_ebuild, bad_stable_keywords))
 
 		good_keywords_exist = len(bad_stable_keywords) < len(keywords)

[gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/eclasses/

[Brian Dolbec]

commit:     a2ee8a9a3c25723f0501286adee8e42a4f323aca
Author:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Sat Apr 30 16:15:31 2016 +0000
Commit:     Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Sat Apr 30 16:15:31 2016 +0000
URL:        https://gitweb.gentoo.org/proj/portage.git/commit/?id=a2ee8a9a

repoman/modules/.../live.py: Fix space error in qa message

 pym/repoman/modules/scan/eclasses/live.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pym/repoman/modules/scan/eclasses/live.py b/pym/repoman/modules/scan/eclasses/live.py
index a5b06ed..dca10b5 100644
--- a/pym/repoman/modules/scan/eclasses/live.py
+++ b/pym/repoman/modules/scan/eclasses/live.py
@@ -52,7 +52,7 @@ class LiveEclassChecks(ScanBase):
 
 		if bad_stable_keywords:
 			self.qatracker.add_error(
-				"LIVEVCS.stable", "%s/%s.ebuild with stable keywords :%s" % (
+				"LIVEVCS.stable", "%s/%s.ebuild with stable keywords: %s" % (
 					package, y_ebuild, bad_stable_keywords))
 
 		good_keywords_exist = len(bad_stable_keywords) < len(keywords)