Split up built_target into target and built_target

diff --git a/ChangeLog b/ChangeLog
index 4870a8b5231d87789d28dc3caca08eb9fb695531..c1f14fa05998189af0c1d922ee838e316d5f5689 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -3,6 +3,10 @@
 # Distributed under the GPL v2
 # $Id$
 
+  28 Nov 2009; Andrew Gaffney <agaffney@gentoo.org>
+  modules/catalyst/target/__init__.py:
+  Split up built_target into target and built_target
+
   28 Nov 2009; Andrew Gaffney <agaffney@gentoo.org>
   modules/catalyst/target/__init__.py:
   Add initial built_target support

diff --git a/modules/catalyst/target/__init__.py b/modules/catalyst/target/__init__.py
index b9dcc7bca08337b490a9bf447825ba7a06115517..7d735bd91dbadd44736b7ccad213ee3ad2851bde 100644 (file)
--- a/modules/catalyst/target/__init__.py
+++ b/modules/catalyst/target/__init__.py
@@ -41,15 +41,37 @@ def find_built_targets(build_dir):
 
        return built_targets
 
-class built_target:
+class target:
 
-       _filename = None
        _target = None
        _version_stamp = None
        _arch = None
        _rel_type = None
        _media = None
 
+       def get_target(self):
+               return self._target
+
+       def get_arch(self):
+               return self._arch
+
+       def get_version_stamp(self):
+               return self._version_stamp
+
+       def get_media(self):
+               return self._media
+
+       def get_rel_type(self):
+               return self._rel_type
+
+       def get_target_info(self):
+               foo = { 'target': self._target, 'arch': self._arch, 'version_stamp': self._version_stamp, 'rel_type': self._rel_type, 'media': self._media }
+               return foo
+
+class built_target(target):
+
+       _filename = None
+
        def __init__(self, filename=None):
                if filename:
                        self.parse_filename(filename)
@@ -72,23 +94,4 @@ class built_target:
                self._arch = arch
                self._version_stamp = version_stamp
 
-       def get_target(self):
-               return self._target
-
-       def get_arch(self):
-               return self._arch
-
-       def get_version_stamp(self):
-               return self._version_stamp
-
-       def get_media(self):
-               return self._media
-
-       def get_rel_type(self):
-               return self._rel_type
-
-       def get_values(self):
-               foo = { 'target': self._target, 'arch': self._arch, 'version_stamp': self._version_stamp, 'rel_type': self._rel_type, 'media': self._media }
-               return foo
-
 # vim: ts=4 sw=4 sta noet sts=4 ai