Openembedded Core Discussions
 help / color / mirror / Atom feed
* [PATCH] sshcontrol: Use os.environ.copy() instead of copy.copy()
@ 2015-07-29  9:50 Richard Purdie
  0 siblings, 0 replies; only message in thread
From: Richard Purdie @ 2015-07-29  9:50 UTC (permalink / raw)
  To: openembedded-core

os.environ is special and copy.copy() doesn't do what we'd expect,
changes in the child object change the parent. copy.deepcopy() is
also known to have issues with it.

Use the dedicated .copy() method which will not influence the 
parent. This fixes selftest failures where the DISPLAY variable 
disappears.

Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>

diff --git a/meta/lib/oeqa/utils/sshcontrol.py b/meta/lib/oeqa/utils/sshcontrol.py
index 4f8d3d2..6ed48ba 100644
--- a/meta/lib/oeqa/utils/sshcontrol.py
+++ b/meta/lib/oeqa/utils/sshcontrol.py
@@ -10,7 +10,6 @@ import subprocess
 import time
 import os
 import select
-import copy
 
 
 class SSHProcess(object):
@@ -33,7 +32,7 @@ class SSHProcess(object):
         self.logfile = None
 
         # Unset DISPLAY which means we won't trigger SSH_ASKPASS
-        env = copy.copy(os.environ)
+        env = os.environ.copy()
         if "DISPLAY" in env:
             del env['DISPLAY']
         self.options['env'] = env




^ permalink raw reply related	[flat|nested] only message in thread

only message in thread, other threads:[~2015-07-29  9:51 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2015-07-29  9:50 [PATCH] sshcontrol: Use os.environ.copy() instead of copy.copy() Richard Purdie

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox