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 3D12213873B for ; Sun, 2 Mar 2014 22:55:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id CD0E1E0B75; Sun, 2 Mar 2014 22:55:25 +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 66FEFE0B75 for ; Sun, 2 Mar 2014 22:55:25 +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 970E333F8A3 for ; Sun, 2 Mar 2014 22:55:24 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 2EAE2188EA for ; Sun, 2 Mar 2014 22:55:23 +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: <1393800844.02b002e091994999abd74d9c34e5ad9a34d41e17.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:master commit in: catalyst/ X-VCS-Repository: proj/catalyst X-VCS-Files: catalyst/support.py X-VCS-Directories: catalyst/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 02b002e091994999abd74d9c34e5ad9a34d41e17 X-VCS-Branch: master Date: Sun, 2 Mar 2014 22:55:23 +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: 1948955c-4a43-4483-aac1-4a2cfbdc5f16 X-Archives-Hash: b4304c2dd98777f0a37b030290e6936f Message-ID: <20140302225523.BP-il95JsRkkbbvLUEnhzOfY0pqk0hL1TIla5KS2Z_I@z> commit: 02b002e091994999abd74d9c34e5ad9a34d41e17 Author: Brian Dolbec gentoo org> AuthorDate: Sun Mar 2 16:43:16 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Sun Mar 2 22:54:04 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=02b002e0 catalyst/support.py: Update for snakeoil API change. --- catalyst/support.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalyst/support.py b/catalyst/support.py index 316dfa3..5e7ce92 100644 --- a/catalyst/support.py +++ b/catalyst/support.py @@ -618,8 +618,8 @@ def read_makeconf(mymakeconffile): if os.path.exists(mymakeconffile): try: try: - import snakeoil.fileutils - return snakeoil.fileutils.read_bash_dict(mymakeconffile, sourcing_command="source") + import snakeoil.bash #import snakeoil.fileutils + return snakeoil.bash.read_bash_dict(mymakeconffile, sourcing_command="source") except ImportError: try: import portage.util