From 27a043681399e40b7351687b01c53ad38dd221e9 Mon Sep 17 00:00:00 2001 From: Brian Dolbec Date: Fri, 11 Jan 2013 22:54:11 -0800 Subject: [PATCH] fix catalyst_support import to new location and specify imported modules --- catalyst/main.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) 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 " __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 -- 2.26.2