fix a few problems with the last commit

diff --git a/modules/catalyst/target/__init__.py b/modules/catalyst/target/__init__.py
index 3bb100c7ea8d5496750c177ddba1cd06050d8090..9ad8b6424961c2a21b1ea5d6f7a95cf14b36a0b5 100644 (file)
--- a/modules/catalyst/target/__init__.py
+++ b/modules/catalyst/target/__init__.py
@@ -46,10 +46,10 @@ def build_targets():
 
        for target in buildplan:
                try:
-                       target.run()
+                       target['object'].run()
                except:
                        catalyst.util.print_traceback()
-                       catalyst.output.warn("Error encountered during run of target " + x)
+                       catalyst.output.warn("Error encountered during run of target " + target['info']['target'])
                        raise
 
 def build_target_buildplan():
@@ -59,7 +59,7 @@ def build_target_buildplan():
        spec_values = spec.get_values()
        targetmap = config.get_targetmap()
 
-       built_targets = find_built_targets(spec_values['storedir'] + '/builds/')
+       built_targets = find_built_targets(config.get_conf()['storedir'] + '/builds/')
 
        if not "targets" in spec_values or not spec_values['targets']:
                raise CatalystError, "No target(s) specified."
@@ -78,7 +78,7 @@ def build_target_buildplan():
                        targets[i]['parent'] = 'pass'
                        continue
 
-               for x target['depends']:
+               for x in target['depends']:
                        for y in built_targets:
                                info = y.get_target_info()
                                if info['target'] == y and info['version_stamp'] == target['info']['version_stamp'] and \

diff --git a/modules/catalyst/target/generic.py b/modules/catalyst/target/generic.py
index e0270a521cb67c34765ff25197c61e5fdfc4f6e7..84865e95feb6a6826266a61697c91da35be2139f 100644 (file)
--- a/modules/catalyst/target/generic.py
+++ b/modules/catalyst/target/generic.py
@@ -24,10 +24,11 @@ class generic_target(catalyst.target.target):
                self.env={}
                self.env["PATH"]="/bin:/sbin:/usr/bin:/usr/sbin"
 
-               self._arch = self.settings["subarch"]
+               if 'subarch' in self.settings:
+                       self._arch = self.settings["subarch"]
                self._rel_type = self.settings["rel_type"]
                self._version_stamp = self.settings["version_stamp"]
-               self._media = self.settings["build"]
+               self._media = "build"
                self._target = self.get_target_name()
 
        def get_target_name(self):