sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-11-04 07:51:21 +00:00
Code Issues Releases Wiki Activity

utils/ssh, host: Remove sudo prompt from output

Browse Source 
On a target where sudo is required, target.file_exists() erroneously
returns True despite the execute() output being:

  '[sudo] password for valsch01: 0\n'

The sudo prompt is being written to stderr (as per sudo -S), but this is
still merged into the final execute() output. Get rid of the prompt to
prevent it from interfering with any command output processor.

Signed-off-by: Valentin Schneider <valentin.schneider@arm.com>
This commit is contained in:
Valentin Schneider
2020-11-04 15:00:50 +00:00
committed by Marc Bonnici
parent 822c50273f
commit 1381944e5b
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
devlib/host.py
View File

@@ -101,7 +101,7 @@ class LocalConnection(ConnectionBase):
if self.unrooted: if self.unrooted:
raise TargetStableError('unrooted') raise TargetStableError('unrooted')
password = self._get_password() password = self._get_password()
command = 'echo {} | sudo -S -- sh -c '.format(quote(password)) + quote(command) command = 'echo {} | sudo -p ' ' -S -- sh -c '.format(quote(password)) + quote(command)
ignore = None if check_exit_code else 'all' ignore = None if check_exit_code else 'all'
try: try:
stdout, stderr = check_output(command, shell=True, timeout=timeout, ignore=ignore) stdout, stderr = check_output(command, shell=True, timeout=timeout, ignore=ignore)
@@ -119,7 +119,7 @@ class LocalConnection(ConnectionBase):
if self.unrooted: if self.unrooted:
raise TargetStableError('unrooted') raise TargetStableError('unrooted')
password = self._get_password() password = self._get_password()
command = 'echo {} | sudo -S '.format(quote(password)) + command command = 'echo {} | sudo -p ' ' -S '.format(quote(password)) + command
# Make sure to get a new PGID so PopenBackgroundCommand() can kill # Make sure to get a new PGID so PopenBackgroundCommand() can kill
# all sub processes that could be started without troubles. # all sub processes that could be started without troubles.

4
devlib/utils/ssh.py
View File

@@ -286,7 +286,7 @@ class SshConnectionBase(ConnectionBase):
keyfile=None, keyfile=None,
port=None, port=None,
platform=None, platform=None,
sudo_cmd="sudo -S -- sh -c {}", sudo_cmd="sudo -p ' ' -S -- sh -c {}",
strict_host_check=True, strict_host_check=True,
): ):
super().__init__() super().__init__()
@@ -369,7 +369,7 @@ class SshConnection(SshConnectionBase):
port=22, port=22,
timeout=None, timeout=None,
platform=None, platform=None,
sudo_cmd="sudo -S -- sh -c {}", sudo_cmd="sudo -p ' ' -S -- sh -c {}",
strict_host_check=True, strict_host_check=True,
use_scp=False, use_scp=False,
poll_transfers=False, poll_transfers=False,