| 1 |
commit: 3b82d27c1f7f52fbd2970886c7f1c26c92678d35 |
| 2 |
Author: Sebastian Pipping <sebastian <AT> pipping <DOT> org> |
| 3 |
AuthorDate: Fri Oct 30 15:11:11 2015 +0000 |
| 4 |
Commit: Sebastian Pipping <sping <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Oct 30 15:11:11 2015 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/metagen.git/commit/?id=3b82d27c |
| 7 |
|
| 8 |
Fix herdbase import for portage >=2.2.22 (bug #561908) |
| 9 |
|
| 10 |
metagen/main.py | 9 ++++++++- |
| 11 |
1 file changed, 8 insertions(+), 1 deletion(-) |
| 12 |
|
| 13 |
diff --git a/metagen/main.py b/metagen/main.py |
| 14 |
index a8e8515..d9aded4 100755 |
| 15 |
--- a/metagen/main.py |
| 16 |
+++ b/metagen/main.py |
| 17 |
@@ -18,9 +18,16 @@ from optparse import OptionParser |
| 18 |
from commands import getstatusoutput |
| 19 |
|
| 20 |
from portage import config |
| 21 |
-from repoman import herdbase |
| 22 |
from portage.output import red, blue |
| 23 |
|
| 24 |
+try: |
| 25 |
+ # portage <2.2.22 |
| 26 |
+ # https://bugs.gentoo.org/show_bug.cgi?id=561908 |
| 27 |
+ from repoman import herdbase |
| 28 |
+except ImportError: |
| 29 |
+ # portage >=2.2.22 |
| 30 |
+ from repoman.checks.herds import herdbase |
| 31 |
+ |
| 32 |
from metagen.version import __version__ |
| 33 |
from metagen import metagenerator |
Archives