[patch] try pkgcore and portage config parsing

catalyst.patch (text/plain), 1.64 KB, created by Andrew Gaffney (RETIRED) on 2007-09-25 22:01:09 UTC

Index: catalyst_support.py
===================================================================
--- catalyst_support.py (revision 1244)
+++ catalyst_support.py (working copy)
@@ -634,16 +634,24 @@
 
 def read_makeconf(mymakeconffile):
        if os.path.exists(mymakeconffile):
-           try:
-                   myf=open(mymakeconffile,"r")
-                   mylines=myf.readlines()
-                   myf.close()
-                   return parse_makeconf(mylines)
-           except:
-                   raise CatalystError, "Could not open make.conf file "+mymakeconffile
+               try:
+                       try:
+                               import snakeoil.fileutils
+                               return snakeoil.fileutils.read_bash_dict(mymakeconffile, sourcing_command="source")
+                       except ImportError:
+                               try:
+                                       import portage_util
+                                       return portage_util.getconfig(mymakeconffile, tolerant=1, allow_sourcing=True)
+                               except ImportError:
+                                       myf=open(mymakeconffile,"r")
+                                       mylines=myf.readlines()
+                                       myf.close()
+                                       return parse_makeconf(mylines)
+               except:
+                       raise CatalystError, "Could not parse make.conf file "+mymakeconffile
        else:
-           makeconf={}
-           return makeconf
+               makeconf={}
+               return makeconf
 
 def msg(mymsg,verblevel=1):
        if verbosity>=verblevel: