aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrian Dolbec <dolsen@gentoo.org>2014-05-16 12:09:48 -0700
committerBrian Dolbec <dolsen@gentoo.org>2014-05-16 12:09:48 -0700
commit90a7a7b7858db642ec51cd5fac4c2432adb05533 (patch)
tree5fc064c2bc81d289f2b53ee0d44fdfc110dc344b
parentgeneric_stage_target: Add a trailing / to the cp /etc/reolv.conf command (diff)
downloadcatalyst-90a7a7b7858db642ec51cd5fac4c2432adb05533.tar.gz
catalyst-90a7a7b7858db642ec51cd5fac4c2432adb05533.tar.bz2
catalyst-90a7a7b7858db642ec51cd5fac4c2432adb05533.zip
modules/catalyst_support.py: Update snakeoil import path change
-rw-r--r--modules/catalyst_support.py4
1 files 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