From 71b062cff711ccfc0a819408cc47b8ffed29131d Mon Sep 17 00:00:00 2001 From: Daniel Robbins Date: Thu, 6 Nov 2003 02:48:21 +0000 Subject: [PATCH] fixo git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@53 d1e1f19c-881f-0410-ab34-b69fee027534 --- modules/catalyst_support.py | 2 ++ modules/targets.py | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py index 19280c82..195f6b81 100644 --- a/modules/catalyst_support.py +++ b/modules/catalyst_support.py @@ -2,6 +2,8 @@ import sys,string,os required_config_file_values=["storedir","sharedir","distdir","portdir"] valid_config_file_values=required_config_file_values[:] +valid_config_file_values.append("PKGCACHE") +valid_config_file_values.append("CCACHE") valid_config_file_values.append("options") verbosity=1 diff --git a/modules/targets.py b/modules/targets.py index 79870c12..fbbd3f06 100644 --- a/modules/targets.py +++ b/modules/targets.py @@ -39,13 +39,13 @@ class generic_stage_target(generic_target): for x in targetmap[self.settings["hostarch"]]: try: fh=open(self.settings["sharedir"]+"/arch/"+x+".py") + #this next line loads the plugin as a module and assigns it to archmap[x] + self.archmap[x]=imp.load_module(x,fh,"arch/"+x+".py",(".py","r",imp.PY_SOURCE)) + #this next line registers all the subarches supported in the plugin + self.archmap[x].register(self.subarchmap) + fh.close() except IOError: - raise CatalystError, "Can't find "+x+".py plugin in "+self.settings["sharedir"]+"/arch/" - #this next line loads the plugin as a module and assigns it to archmap[x] - self.archmap[x]=imp.load_module(x,fh,"arch/"+x+".py",(".py","r",imp.PY_SOURCE)) - #this next line registers all the subarches supported in the plugin - self.archmap[x].register(self.subarchmap) - fh.close() + msg("Can't find "+x+".py plugin in "+self.settings["sharedir"]+"/arch/") #call arch constructor, pass our settings self.arch=self.subarchmap[self.settings["subarch"]](self.settings) #self.settings["mainarch"] should now be set by our arch constructor, so we print -- 2.26.2