From 8b15f74de3a244dcc1c7b39903ff2f1cddb4ecf5 Mon Sep 17 00:00:00 2001 From: Andrew Gaffney Date: Sat, 10 Jan 2009 20:59:41 -0600 Subject: [PATCH] Remove import_modules() --- ChangeLog | 3 +++ catalyst | 11 ++--------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/ChangeLog b/ChangeLog index 8569c7d3..e3c64dbb 100644 --- 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 catalyst: + Remove import_modules() + 11 Jan 2009; Andrew Gaffney catalyst, modules/catalyst/target/embedded.py, modules/catalyst/target/generic_stage.py, modules/catalyst/target/grp.py, diff --git a/catalyst b/catalyst index 29e00f69..33827836 100755 --- 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 " __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={} -- 2.26.2