QuartusUSBJTAG: fix to use copied env again

This was removed prior but can not work at least for the exporter
as os.env is per process and for all subprocesses. In the epxorter
case this leads to interference between different exported resources.

Author: sessl3r

labgrid/driver/quartuspgmdriver.py

@@ -64,8 +64,9 @@ def operate(self, filename=None, operation="P", devnum=1) -> tuple[str, str]:
         lib_path = importlib.machinery.PathFinder.find_spec('libfilsel').origin
 
         ld_preload = [lib_path, os.getenv('LD_PRELOAD', "")]
-        os.environ["LD_PRELOAD"] = os.pathsep.join(ld_preload)
-        os.environ["FILSEL_ORG_PATH"] = str((Path(os.path.expanduser('~')) / ".jtag.conf").resolve())
+        my_env = os.environ.copy()
+        my_env["LD_PRELOAD"] = os.pathsep.join(ld_preload)
+        my_env["FILSEL_ORG_PATH"] = str((Path(os.path.expanduser('~')) / ".jtag.conf").resolve())
 
         cable = f"'{self.interface.device_name} on {self.interface.host}:{self.interface.jtagd_port} {self.interface.device_port}'"
         operation = f"'{operation};{filename}@{str(devnum)}'"
@@ -81,9 +82,9 @@ def operate(self, filename=None, operation="P", devnum=1) -> tuple[str, str]:
             conf_temp.write(cfg.encode("utf-8"))
             conf_temp.flush()
             log.info("Flashing with command: %s", cmd)
-            os.environ["FILSEL_DEST_PATH"] = conf_temp.name
+            my_env["FILSEL_DEST_PATH"] = conf_temp.name
 
-            process = subprocess.Popen(cmd, shell=True,
+            process = subprocess.Popen(cmd, shell=True, env=my_env,
                     stdout=subprocess.PIPE, stderr=subprocess.PIPE)
             stdout, stderr = process.communicate()
 

labgrid/remote/exporter.py

@@ -390,15 +390,16 @@ def _start(self, start_params):
         # find the right path to the library and modify the env
         lib_path = importlib.machinery.PathFinder.find_spec('libhwsf').origin
         ld_preload = [lib_path, os.getenv('LD_PRELOAD', "")]
-        os.environ["LD_PRELOAD"] = os.pathsep.join(ld_preload)
-        os.environ["HWSF_DEV"] = "path:" + self.local.device.sys_name
+        my_env = os.environ.copy()
+        my_env["LD_PRELOAD"] = os.pathsep.join(ld_preload)
+        my_env["HWSF_DEV"] = "path:" + self.local.device.sys_name
 
         cmd = f"{self.local.jtagd_cmd} --foreground --port {self.jtagd_port} --config {self.cfg_tempfile.name}"
 
         self.logger.info("starting jtagd for %s on port %s with command LD_PRELOAD+=%s HWSF_DEV=%s %s",
                          self.local.device.sys_name, self.jtagd_port, lib_path,
-                         os.environ['HWSF_DEV'], cmd)
-        self.child = subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid)
+                         my_env['HWSF_DEV'], cmd)
+        self.child = subprocess.Popen(cmd, env=my_env, shell=True, preexec_fn=os.setsid)
 
     def _stop(self,  start_params):
         """Stop ``jtagd`` subprocess"""