forked from ungleich-public/cdist
		
	Merge remote-tracking branch 'telmich/master'
This commit is contained in:
		
				commit
				
					
						0b1d7d01e0
					
				
			
		
					 2 changed files with 3 additions and 2 deletions
				
			
		| 
						 | 
					@ -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()
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -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"""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue