From: Brian Dolbec <dolsen@gentoo.org>
Date: Sat, 12 Jan 2013 06:54:11 +0000 (-0800)
Subject: fix catalyst_support import to new location and specify imported modules
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=27a043681399e40b7351687b01c53ad38dd221e9;p=catalyst.git

fix catalyst_support import to new location and specify imported modules
---

diff --git a/catalyst/main.py b/catalyst/main.py
index b4390b2e..79476466 100644
--- 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