Merge branch 'master' into install_integration
This commit is contained in:
		
				commit
				
					
						5858ebda53
					
				
			
		
					 1 changed files with 3 additions and 1 deletions
				
			
		| 
						 | 
					@ -194,7 +194,9 @@ class Emulator(object):
 | 
				
			||||||
                except core.cdist_type.NoSuchTypeError as e:
 | 
					                except core.cdist_type.NoSuchTypeError as e:
 | 
				
			||||||
                    self.log.error("%s requires object %s, but type %s does not exist (definded at %s)"  % (self.cdist_object.name, requirement, e.name, self.object_source))
 | 
					                    self.log.error("%s requires object %s, but type %s does not exist (definded at %s)"  % (self.cdist_object.name, requirement, e.name, self.object_source))
 | 
				
			||||||
                    raise
 | 
					                    raise
 | 
				
			||||||
 | 
					                except core.cdist_object.MissingObjectIdError as e:
 | 
				
			||||||
 | 
					                    self.log.error("%s requires object %s (without object id), but type %s is not a singleton (definded at %s)"  % (self.cdist_object.name, requirement, e.type_name, self.object_source))
 | 
				
			||||||
 | 
					                    raise
 | 
				
			||||||
 | 
					
 | 
				
			||||||
                self.log.debug("Recording requirement: " + requirement)
 | 
					                self.log.debug("Recording requirement: " + requirement)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue