diff options
-rw-r--r-- | src/lib/Server/Generators/cfg.py | 7 | ||||
-rw-r--r-- | src/lib/Server/Generators/servicemgr.py | 16 |
2 files changed, 7 insertions, 16 deletions
diff --git a/src/lib/Server/Generators/cfg.py b/src/lib/Server/Generators/cfg.py index fc9385d40..e2f70b8bc 100644 --- a/src/lib/Server/Generators/cfg.py +++ b/src/lib/Server/Generators/cfg.py @@ -5,10 +5,9 @@ from re import compile from stat import S_ISDIR, ST_MODE from string import join -from Types import ConfigFile -from Generator import Generator -from GeneratorUtils import DirectoryBacked, FileBacked -from Metadata import Metadata +from Bcfg2.Server.Generator import Generator +from Bcfg2.Server.GeneratorUtils import DirectoryBacked, FileBacked +from Bcfg2.Server.Metadata import Metadata class FileEntry(FileBacked): '''The File Entry class pertains to the config files contained in a particular directory. diff --git a/src/lib/Server/Generators/servicemgr.py b/src/lib/Server/Generators/servicemgr.py index 98d3aa274..2e7a480ae 100644 --- a/src/lib/Server/Generators/servicemgr.py +++ b/src/lib/Server/Generators/servicemgr.py @@ -1,18 +1,10 @@ #!/usr/bin/env python -from Generator import Generator -from GeneratorUtils import XMLFileBacked +from Bcfg2.Server.Generator import Generator +from Bcfg2.Server.GeneratorUtils import SingleXMLFileBacked - -class ServiceList(XMLFileBacked): - def __init__(self, filename, fam): - XMLFileBacked.__init__(self, filename) - fam.AddMonitor(filename) - - def Index(self): - a = XML(self.data) - self.name = a.attrib['name'] - self.entries = a.getchildren() +class ServiceList(SingleXMLFileBacked): + pass class servicemgr(Generator): '''This is a generator that handles service assignments''' |