fixo

git-svn-id: svn+ssh://svn.gentoo.org/var/svnroot/catalyst/trunk@53 d1e1f19c-881f-0410-ab34-b69fee027534

diff --git a/modules/catalyst_support.py b/modules/catalyst_support.py
index 19280c828014e9035b8d1c1c4e0576464b4ce773..195f6b81e9d6b7000159d7acbec09c5148670a72 100644 (file)
--- 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 79870c12af99167cdb54a14084d600a79e334870..fbbd3f0673a63f87ab4bc2d222a3710b15328581 100644 (file)
--- 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