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 AB217138F2A for ; Sat, 22 Feb 2014 19:28:52 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 47096E0B8A; Sat, 22 Feb 2014 19:28:52 +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 D134EE0B8A for ; Sat, 22 Feb 2014 19:28:51 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 082AD33F9AF for ; Sat, 22 Feb 2014 19:28:51 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id C1C73188A2 for ; Sat, 22 Feb 2014 19:28:49 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1393096939.29de73337a703bcfe706d8b7df35c92781854ad5.dol-sen@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit commit in: pym/gentoolkit/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: pym/gentoolkit/sets.py X-VCS-Directories: pym/gentoolkit/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 29de73337a703bcfe706d8b7df35c92781854ad5 X-VCS-Branch: gentoolkit Date: Sat, 22 Feb 2014 19:28:49 +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: ad3735d3-7b58-4c87-93bb-100281ba945a X-Archives-Hash: cdf78e45bbdd915ff410affc679c6a06 commit: 29de73337a703bcfe706d8b7df35c92781854ad5 Author: Merlijn Wajer wizzup org> AuthorDate: Sat Feb 22 19:22:19 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sat Feb 22 19:22:19 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=29de7333 Fix the broken import statement for sets. This udates gentoolkit for the renamed sets module to _sets. --- pym/gentoolkit/sets.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/pym/gentoolkit/sets.py b/pym/gentoolkit/sets.py index b9c3601..70315e9 100644 --- a/pym/gentoolkit/sets.py +++ b/pym/gentoolkit/sets.py @@ -10,9 +10,11 @@ __docformat__ = 'epytext' import portage try: - import portage.sets + # Per commit 25d8427b3b29cbcee97279186983dae818495f8f in portage, + # portage.sets is renamed to portage._sets. + import portage._sets _sets_available = True - SETPREFIX = portage.sets.SETPREFIX + SETPREFIX = portage._sets.SETPREFIX except ImportError: _sets_available = False SETPREFIX = "@" @@ -25,7 +27,7 @@ _set_config = None def _init_set_config(): global _set_config if _set_config is None: - _set_config = portage.sets.load_default_config( + _set_config = portage._sets.load_default_config( portage.settings, portage.db[portage.root]) def get_available_sets(): @@ -50,7 +52,7 @@ def get_set_atoms(setname): try: return set([Atom(str(x)) for x in _set_config.getSetAtoms(setname)]) - except portage.sets.PackageSetNotFound: + except portage._sets.PackageSetNotFound: raise errors.GentoolkitSetNotFound(setname) raise errors.GentoolkitSetNotFound(setname)