fix catalyst_support import to new location and specify imported modules

diff --git a/catalyst/main.py b/catalyst/main.py
index b4390b2e617aef7912b61edd433cb8044428e195..79476466763280ef2cdc447e61fc64442dba0d3a 100644 (file)
--- a/catalyst/main.py
+++ b/catalyst/main.py
@@ -17,6 +17,8 @@ sys.path.append(__selfpath__ + "/modules")
 
 import catalyst.config
 import catalyst.util
+from catalyst.modules.catalyst_support import (required_build_targets,
+       valid_build_targets, CatalystError, hash_map, find_binary, LockInUse)
 
 __maintainer__="Catalyst <catalyst@gentoo.org>"
 __version__="2.0.12.2"
@@ -351,8 +353,6 @@ def main():
 
        # import configuration file and import our main module using those settings
        parse_config(myconfig)
-       sys.path.append(conf_values["sharedir"]+"/modules")
-       from catalyst_support import *
 
        # Start checking that digests are valid now that the hash_map was imported
        # from catalyst_support