From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (unknown [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8B9041381FA for ; Fri, 16 May 2014 19:15:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 1BD8AE0AE0; Fri, 16 May 2014 19:15:49 +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 74A0FE0AE0 for ; Fri, 16 May 2014 19:15:48 +0000 (UTC) Received: from spoonbill.gentoo.org (unknown [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 08B3B3400CA for ; Fri, 16 May 2014 19:15:47 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id 9BB9C1818D for ; Fri, 16 May 2014 19:15:45 +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: <1400267388.90a7a7b7858db642ec51cd5fac4c2432adb05533.dol-sen@gentoo> Subject: [gentoo-commits] proj/catalyst:2.X commit in: modules/ X-VCS-Repository: proj/catalyst X-VCS-Files: modules/catalyst_support.py X-VCS-Directories: modules/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 90a7a7b7858db642ec51cd5fac4c2432adb05533 X-VCS-Branch: 2.X Date: Fri, 16 May 2014 19:15:45 +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: a2a0b438-cffe-4f1b-9ebc-b385415b873e X-Archives-Hash: b77c83b8ef3ca76a781761154893fefd commit: 90a7a7b7858db642ec51cd5fac4c2432adb05533 Author: Brian Dolbec gentoo org> AuthorDate: Fri May 16 19:09:48 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Fri May 16 19:09:48 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=90a7a7b7 modules/catalyst_support.py: Update snakeoil import path change --- modules/catalyst_support.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py index d493f88..8112ed0 100644 --- a/modules/catalyst_support.py +++ b/modules/catalyst_support.py @@ -620,8 +620,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