tom/cdist
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge remote-tracking branch 'telmich/master'

Browse source
This commit is contained in:
Steven Armstrong 2011-10-13 01:19:25 +02:00
commit 0b1d7d01e0
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lib/cdist/config_install.py
View file

@ -31,7 +31,7 @@ import time
import cdist.core import cdist.core
import cdist.context import cdist.context
import cdist.exec import cdist.exec
import cdist.explorer #import cdist.explorer
#import cdist.manifest #import cdist.manifest
class ConfigInstall(object): class ConfigInstall(object):
@ -53,7 +53,7 @@ class ConfigInstall(object):
self.global_explorer = cdist.explorer.GlobalExplorer(self.context.global_in, out) self.global_explorer = cdist.explorer.GlobalExplorer(self.context.global_in, out)
self.type_explorer = cdist.explorer.GlobalExplorer(self.context.global_in, out) self.type_explorer = cdist.explorer.GlobalExplorer(self.context.global_in, out)
self.explorer = cdist.explorer.Explorer(self.context) self.global_explorer = cdist.core.GlobalExplorer
#self.manifest = cdist.manifest.Mamifest() #self.manifest = cdist.manifest.Mamifest()
self.manifest.initial_manifest() self.manifest.initial_manifest()

1
lib/cdist/test/type_explorer/__init__.py
View file

@ -35,4 +35,5 @@ class TypeExplorer(unittest.TestCase):
def setUp(self): def setUp(self):
def test_explorer_output(self): def test_explorer_output(self):
"""Check for output of type explorer"""