Gentoo Archives: gentoo-commits

From: Brian Dolbec <brian.dolbec@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/catalyst:3.0 commit in: catalyst/
Date: Wed, 22 Jan 2014 05:04:31
Message-Id: 1390365366.68477519c33bc58ac8ac76090861525020d7221f.dol-sen@gentoo
1 commit: 68477519c33bc58ac8ac76090861525020d7221f
2 Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
3 AuthorDate: Wed Jan 22 01:55:24 2014 +0000
4 Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> com>
5 CommitDate: Wed Jan 22 04:36:06 2014 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/catalyst.git;a=commit;h=68477519
7
8 sankeoil import fix
9
10 ---
11 catalyst/support.py | 4 ++--
12 1 file changed, 2 insertions(+), 2 deletions(-)
13
14 diff --git a/catalyst/support.py b/catalyst/support.py
15 index cafb5d2..08bddfe 100644
16 --- a/catalyst/support.py
17 +++ b/catalyst/support.py
18 @@ -215,8 +215,8 @@ def read_makeconf(mymakeconffile):
19 if os.path.exists(mymakeconffile):
20 try:
21 try:
22 - import snakeoil.fileutils
23 - return snakeoil.fileutils.read_bash_dict(mymakeconffile, sourcing_command="source")
24 + import snakeoil.bash #import snakeoil.fileutils
25 + return snakeoil.bash.read_bash_dict(mymakeconffile, sourcing_command="source")
26 except ImportError:
27 try:
28 import portage.util