forked from ungleich-public/cdist
		
	Fix shell command not working after new error reporting.
This commit is contained in:
		
					parent
					
						
							
								001232f0d7
							
						
					
				
			
			
				commit
				
					
						e2bb629535
					
				
			
		
					 2 changed files with 15 additions and 7 deletions
				
			
		| 
						 | 
					@ -194,7 +194,8 @@ class Local(object):
 | 
				
			||||||
        self.log.debug("Local mkdir: %s", path)
 | 
					        self.log.debug("Local mkdir: %s", path)
 | 
				
			||||||
        os.makedirs(path, exist_ok=True)
 | 
					        os.makedirs(path, exist_ok=True)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    def run(self, command, env=None, return_output=False, message_prefix=None):
 | 
					    def run(self, command, env=None, return_output=False, message_prefix=None,
 | 
				
			||||||
 | 
					            save_output=True):
 | 
				
			||||||
        """Run the given command with the given environment.
 | 
					        """Run the given command with the given environment.
 | 
				
			||||||
        Return the output as a string.
 | 
					        Return the output as a string.
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -216,11 +217,17 @@ class Local(object):
 | 
				
			||||||
            env.update(message.env)
 | 
					            env.update(message.env)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        try:
 | 
					        try:
 | 
				
			||||||
 | 
					            if save_output:
 | 
				
			||||||
                output, errout = exec_util.call_get_output(command, env=env)
 | 
					                output, errout = exec_util.call_get_output(command, env=env)
 | 
				
			||||||
                self.log.debug("Local stdout: {}".format(output))
 | 
					                self.log.debug("Local stdout: {}".format(output))
 | 
				
			||||||
                self.log.debug("Local stderr: {}".format(errout))
 | 
					                self.log.debug("Local stderr: {}".format(errout))
 | 
				
			||||||
                if return_output:
 | 
					                if return_output:
 | 
				
			||||||
                    return output.decode()
 | 
					                    return output.decode()
 | 
				
			||||||
 | 
					            else:
 | 
				
			||||||
 | 
					                # In some cases no output is saved.
 | 
				
			||||||
 | 
					                # This is used for shell command, stdout and stderr
 | 
				
			||||||
 | 
					                # must not be catched.
 | 
				
			||||||
 | 
					                subprocess.check_call(command, env=env)
 | 
				
			||||||
        except subprocess.CalledProcessError as e:
 | 
					        except subprocess.CalledProcessError as e:
 | 
				
			||||||
            exec_util.handle_called_process_error(e, command)
 | 
					            exec_util.handle_called_process_error(e, command)
 | 
				
			||||||
        except OSError as error:
 | 
					        except OSError as error:
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -73,7 +73,8 @@ class Shell(object):
 | 
				
			||||||
        self._init_environment()
 | 
					        self._init_environment()
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        log.info("Starting shell...")
 | 
					        log.info("Starting shell...")
 | 
				
			||||||
        self.local.run([self.shell], self.env)
 | 
					        # save_output=False -> do not catch stdout and stderr
 | 
				
			||||||
 | 
					        self.local.run([self.shell], self.env, save_output=False)
 | 
				
			||||||
        log.info("Finished shell.")
 | 
					        log.info("Finished shell.")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    @classmethod
 | 
					    @classmethod
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue