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 529FC138A1F for ; Fri, 18 Apr 2014 16:52:32 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id B0915E0AFA; Fri, 18 Apr 2014 16:52:28 +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 9D847E0AC5 for ; Fri, 18 Apr 2014 16:52:27 +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 B9B24340393 for ; Fri, 18 Apr 2014 16:52:26 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 7F77D18250 for ; Fri, 18 Apr 2014 16:52:24 +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: <1397839836.4d0fc4cfa8b46c05c443908a5cf526ca8a07d902.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:3.0 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: 4d0fc4cfa8b46c05c443908a5cf526ca8a07d902 X-VCS-Branch: 3.0 Date: Fri, 18 Apr 2014 16:52:24 +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: 9130f3d7-7341-4c40-9a64-f13d7748497f X-Archives-Hash: 176d0143d151917565861253f2d67e77 commit: 4d0fc4cfa8b46c05c443908a5cf526ca8a07d902 Author: Brian Dolbec gentoo org> AuthorDate: Wed Jan 22 01:55:24 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri Apr 18 16:50:36 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=4d0fc4cf sankeoil import fix --- catalyst/support.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/catalyst/support.py b/catalyst/support.py index cafb5d2..08bddfe 100644 --- a/catalyst/support.py +++ b/catalyst/support.py @@ -215,8 +215,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