Remove import_modules()

diff --git a/ChangeLog b/ChangeLog
index 8569c7d327362d6ff3ca597a0326671b31fb537f..e3c64dbbd5af2dd85e6fb341a5196f6c46f0798b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 2002-2009 Gentoo Foundation; 2008-2009 Various authors (see AUTHORS)
 # Distributed under the GPL v2
 
+  11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst:
+  Remove import_modules()
+
   11 Jan 2009; Andrew Gaffney <agaffney@gentoo.org> catalyst,
   modules/catalyst/target/embedded.py,
   modules/catalyst/target/generic_stage.py, modules/catalyst/target/grp.py,

diff --git a/catalyst b/catalyst
index 29e00f69f8f890c2999c0e01f6b67ecb9edf0d2b..33827836a686875b85e6fa1e73456675b2b6c877 100755 (executable)
--- a/catalyst
+++ b/catalyst
@@ -14,6 +14,7 @@ sys.path.append(__selfpath__ + "/modules")
 
 import catalyst.config
 import catalyst.util
+import catalyst.target
 
 __maintainer__="Chris Gianelloni <wolf31o2@gentoo.org>"
 __version__="2.99"
@@ -165,13 +166,6 @@ def parse_config(myconfig):
                print "Envscript support enabled."
                conf_values["ENVSCRIPT"]=myconf["envscript"]
 
-def import_modules():
-       # import catalyst's own modules (i.e. catalyst_support and the arch modules)
-       import catalyst.target
-
-       targetmap = catalyst.target.build_target_map()
-       return targetmap
-
 def build_target(addlargs, targetmap):
        try:
                if not targetmap.has_key(addlargs["target"]):
@@ -324,8 +318,7 @@ if __name__ == "__main__":
                        print "Catalyst aborting...."
                        sys.exit(2)
 
-       # import the rest of the catalyst modules
-       targetmap=import_modules()
+       targetmap = catalyst.target.build_target_map()
 
        addlargs={}