| 1 |
commit: 59014f2da612d09d0f969216e68cada91c19853d |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Apr 30 14:21:23 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Apr 30 14:21:23 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=59014f2d |
| 7 |
|
| 8 |
repoman: Fix commit 8e7971169c2 missing self in func() parameters, bug 581594 |
| 9 |
|
| 10 |
Fixes hastily committed preceeding live vcs logic change. |
| 11 |
X-Gentoo-bug: 581594 |
| 12 |
X-Gentoo-bug-url: https://bugs.gentoo.org/show_bug.cgi?id=581594 |
| 13 |
|
| 14 |
Thank you: Coacher <itumaykin+gentoo <AT> gmail.com> |
| 15 |
|
| 16 |
pym/repoman/modules/scan/eclasses/live.py | 14 +++++++++++--- |
| 17 |
1 file changed, 11 insertions(+), 3 deletions(-) |
| 18 |
|
| 19 |
diff --git a/pym/repoman/modules/scan/eclasses/live.py b/pym/repoman/modules/scan/eclasses/live.py |
| 20 |
index 0036f10..a5b06ed 100644 |
| 21 |
--- a/pym/repoman/modules/scan/eclasses/live.py |
| 22 |
+++ b/pym/repoman/modules/scan/eclasses/live.py |
| 23 |
@@ -26,19 +26,27 @@ class LiveEclassChecks(ScanBase): |
| 24 |
@param xpkg: Package in which we check (string). |
| 25 |
@param ebuild: Ebuild which we check (object). |
| 26 |
@param y_ebuild: Ebuild which we check (string). |
| 27 |
- @returns: dictionary |
| 28 |
+ @returns: boolean |
| 29 |
''' |
| 30 |
pkg = kwargs.get("pkg").result() |
| 31 |
package = kwargs.get('xpkg') |
| 32 |
ebuild = kwargs.get('ebuild').get() |
| 33 |
y_ebuild = kwargs.get('y_ebuild') |
| 34 |
- keywords = ebuild.keywords |
| 35 |
|
| 36 |
if ebuild.live_ebuild and self.repo_settings.repo_config.name == "gentoo": |
| 37 |
return self.check_live(pkg, package, ebuild, y_ebuild) |
| 38 |
return False |
| 39 |
|
| 40 |
- def check_live(pkg, package, ebuild, y_ebuild): |
| 41 |
+ def check_live(self, pkg, package, ebuild, y_ebuild): |
| 42 |
+ '''Perform the live vcs check |
| 43 |
+ |
| 44 |
+ @param pkg: Package in which we check (object). |
| 45 |
+ @param xpkg: Package in which we check (string). |
| 46 |
+ @param ebuild: Ebuild which we check (object). |
| 47 |
+ @param y_ebuild: Ebuild which we check (string). |
| 48 |
+ @returns: boolean |
| 49 |
+ ''' |
| 50 |
+ keywords = ebuild.keywords |
| 51 |
is_stable = lambda kw: not kw.startswith("~") and not kw.startswith("-") |
| 52 |
bad_stable_keywords = list(filter(is_stable, keywords)) |
Archives