From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 45FDE13888F for ; Fri, 30 Oct 2015 15:13:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4D76DE07D2; Fri, 30 Oct 2015 15:13:19 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EE8CDE07D2 for ; Fri, 30 Oct 2015 15:13:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8D460340C2D for ; Fri, 30 Oct 2015 15:13:16 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 944171B1C for ; Fri, 30 Oct 2015 15:13:12 +0000 (UTC) From: "Sebastian Pipping" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sebastian Pipping" Message-ID: <1446217871.3b82d27c1f7f52fbd2970886c7f1c26c92678d35.sping@gentoo> Subject: [gentoo-commits] proj/metagen:master commit in: metagen/ X-VCS-Repository: proj/metagen X-VCS-Files: metagen/main.py X-VCS-Directories: metagen/ X-VCS-Committer: sping X-VCS-Committer-Name: Sebastian Pipping X-VCS-Revision: 3b82d27c1f7f52fbd2970886c7f1c26c92678d35 X-VCS-Branch: master Date: Fri, 30 Oct 2015 15:13:12 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 7b6216c1-1b45-4b7e-9939-f7d85f7a7dc0 X-Archives-Hash: 0b446270afd8d9fce5b36a00ebaa0440 commit: 3b82d27c1f7f52fbd2970886c7f1c26c92678d35 Author: Sebastian Pipping pipping org> AuthorDate: Fri Oct 30 15:11:11 2015 +0000 Commit: Sebastian Pipping gentoo org> CommitDate: Fri Oct 30 15:11:11 2015 +0000 URL: https://gitweb.gentoo.org/proj/metagen.git/commit/?id=3b82d27c Fix herdbase import for portage >=2.2.22 (bug #561908) metagen/main.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/metagen/main.py b/metagen/main.py index a8e8515..d9aded4 100755 --- a/metagen/main.py +++ b/metagen/main.py @@ -18,9 +18,16 @@ from optparse import OptionParser from commands import getstatusoutput from portage import config -from repoman import herdbase from portage.output import red, blue +try: + # portage <2.2.22 + # https://bugs.gentoo.org/show_bug.cgi?id=561908 + from repoman import herdbase +except ImportError: + # portage >=2.2.22 + from repoman.checks.herds import herdbase + from metagen.version import __version__ from metagen import metagenerator