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
commitdf1b859771e04bdd7d67735951a1897333b6c77e (patch)
treea253d0af7a12bfd5aa3cb52129e9e66cb9a27cf3 /src/lib
parented9950e21fd3024978410bae238dbffa0f327d69 (diff)
downloadbcfg2-df1b859771e04bdd7d67735951a1897333b6c77e.tar.gz
bcfg2-df1b859771e04bdd7d67735951a1897333b6c77e.tar.bz2
bcfg2-df1b859771e04bdd7d67735951a1897333b6c77e.zip
fix Type usage
2004/08/12 10:47:49-05:00 anl.gov!desai add extra import 2004/08/12 10:46:39-05:00 anl.gov!desai update to new module path (Logical change 1.39) git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@233 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'src/lib')
-rw-r--r--src/lib/Server/Structures/bundler.py7
1 files changed, 3 insertions, 4 deletions
diff --git a/src/lib/Server/Structures/bundler.py b/src/lib/Server/Structures/bundler.py
index 93658ed94..974e26ea2 100644
--- a/src/lib/Server/Structures/bundler.py
+++ b/src/lib/Server/Structures/bundler.py
@@ -4,8 +4,8 @@
from copy import deepcopy
from syslog import LOG_ERR, syslog
-from GeneratorUtils import SingleXMLFileBacked, DirectoryBacked
-from Structure import Structure
+from Bcfg2.Server.GeneratorUtils import SingleXMLFileBacked, XMLFileBacked, DirectoryBacked
+from Bcfg2.Server.Structure import Structure
from elementtree.ElementTree import Element, XML, tostring
@@ -31,8 +31,7 @@ class bundler(Structure):
'''The bundler creates dependent clauses based on the bundle/translation scheme from bcfg1'''
def __init__(self, core, datastore):
Structure.__init__(self, core, datastore)
- self.imageinfo = ImageFile("%s/common/imageinfo.xml"%(datastore))
- self.core.fam.AddMonitor(self.imageinfo.name, self.imageinfo)
+ self.imageinfo = ImageFile("%s/common/imageinfo.xml"%(datastore), self.core.fam)
self.bundles = BundleSet(self.data, self.core.fam)
def Construct(self, metadata):