diff options
| -rw-r--r-- | meta/lib/oeqa/utils/sshcontrol.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py index 1c81795a87..4f8d3d2c98 100644 --- a/meta/lib/oeqa/utils/sshcontrol.py +++ b/meta/lib/oeqa/utils/sshcontrol.py | |||
| @@ -10,6 +10,7 @@ import subprocess | |||
| 10 | import time | 10 | import time |
| 11 | import os | 11 | import os |
| 12 | import select | 12 | import select |
| 13 | import copy | ||
| 13 | 14 | ||
| 14 | 15 | ||
| 15 | class SSHProcess(object): | 16 | class SSHProcess(object): |
| @@ -31,6 +32,12 @@ class SSHProcess(object): | |||
| 31 | self.starttime = None | 32 | self.starttime = None |
| 32 | self.logfile = None | 33 | self.logfile = None |
| 33 | 34 | ||
| 35 | # Unset DISPLAY which means we won't trigger SSH_ASKPASS | ||
| 36 | env = copy.copy(os.environ) | ||
| 37 | if "DISPLAY" in env: | ||
| 38 | del env['DISPLAY'] | ||
| 39 | self.options['env'] = env | ||
| 40 | |||
| 34 | def log(self, msg): | 41 | def log(self, msg): |
| 35 | if self.logfile: | 42 | if self.logfile: |
| 36 | with open(self.logfile, "a") as f: | 43 | with open(self.logfile, "a") as f: |
