adafruit-mirror/Adafruit_Python_Shell
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix error output was missing

Browse source
This commit is contained in:
Melissa LeBlanc-Williams 2021-02-11 16:40:03 -08:00
parent a55924139b
commit ce64df4e1e
1 changed files with 28 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

51
adafruit_shell.py
View file

@ -63,30 +63,35 @@ class Shell:
"""
Run a shell command and show the output as it runs
"""
proc = subprocess.Popen(
cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
)
full_output = ""
while True:
output = proc.stdout.readline()
if len(output) == 0 and proc.poll() is not None:
break
if output:
decoded_output = output.decode("utf-8", errors="ignore").strip()
if not suppress_message:
self.info(decoded_output)
full_output += decoded_output
r = proc.poll()
if r == 0:
if return_output:
return full_output
return True
err = proc.stderr.read()
if not suppress_message:
self.error(err.decode("utf-8", errors="ignore"))
original_stdout = sys.stdout
original_stderr = sys.stderr
try:
proc = subprocess.Popen(
cmd, shell=True, stdout=subprocess.PIPE, stderr=subprocess.PIPE
)
full_output = ""
while True:
output = proc.stdout.readline()
err = proc.stderr.read()
if len(err) and not suppress_message:
self.error(err.decode("utf-8", errors="ignore"))
if len(output) == 0 and proc.poll() is not None:
break
if output:
decoded_output = output.decode("utf-8", errors="ignore").strip()
if not suppress_message:
self.info(decoded_output)
full_output += decoded_output
except Exception as err: # pylint: disable=broad-except
pass
finally:
sys.stdout = original_stdout
sys.stderr = original_stderr
if return_output:
return full_output
r = proc.poll()
if r == 0:
return True
return False
def info(self, message):
@ -453,7 +458,7 @@ class Shell:
if os.path.exists("/etc/os-release"):
with open("/etc/os-release") as f:
if "Raspbian" in f.read():
release = "Raspian"
release = "Raspbian"
if self.run_command("command -v apt-get", suppress_message=True):
with open("/etc/os-release") as f:
release_file = f.read()