summaryrefslogtreecommitdiffstats
path: root/src/lib
diff options
context:
space:
mode:
authorNarayan Desai <desai@mcs.anl.gov>2004-08-12 16:04:59 +0000
committerNarayan Desai <desai@mcs.anl.gov>2004-08-12 16:04:59 +0000
commited9950e21fd3024978410bae238dbffa0f327d69 (patch)
tree8bbf37a96356c55047ad6a7b7f3196660791b5ec /src/lib
parentda1f94935b16508c79dacbc44f9dd32dbb232616 (diff)
downloadbcfg2-ed9950e21fd3024978410bae238dbffa0f327d69.tar.gz
bcfg2-ed9950e21fd3024978410bae238dbffa0f327d69.tar.bz2
bcfg2-ed9950e21fd3024978410bae238dbffa0f327d69.zip
fix module import stuff
(Logical change 1.39) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@232 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Server/Core.py6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/lib/Server/Core.py b/src/lib/Server/Core.py
index 615c16dff..b481033c4 100644
--- a/src/lib/Server/Core.py
+++ b/src/lib/Server/Core.py
@@ -57,11 +57,13 @@ class Core(object):
self.pubspace = {}
self.structures = []
for structure in structures:
- s = getattr(__import__("Bcfg2.Structures.%s"%(structure)),structure)
+ m = getattr(__import__("Bcfg2.Server.Structures.%s"%(structure)).Server.Structures, structure)
+ s = getattr(m, structure)
self.structures.append(s(self, self.datastore))
self.generators = []
for generator in generators:
- g = getattr(__import__("Bcfg2.Generators.%s"%(generator)),generator)
+ m=getattr(__import__("Bcfg2.Server.Generators.%s"%(generator)).Server.Generators,generator)
+ g = getattr(m, generator)
self.generators.append(g(self, self.datastore))
# we need to inventory and setup generators
# Process generator requirements