[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [craft] bin: Revert "Don't use copy.deepcopy with os.environ"
From:       Ben Cooksley <null () kde ! org>
Date:       2018-09-10 9:51:14
Message-ID: E1fzIqg-00065o-EO () code ! kde ! org
[Download RAW message or body]

Git commit 4a0f76c206bbd653dc840535fe3dbf7b64ac7082 by Ben Cooksley.
Committed on 10/09/2018 at 09:50.
Pushed by bcooksley into branch 'master'.

Revert "Don't use copy.deepcopy with os.environ"

As it turns out larger chunks of Craft are dependent on the environment being filled \
in by this method despite what the code originally intended to happen. Hopefully \
fixing the Path -> PATH will resolve the issue hit on MingW builds when signing.

This reverts commit 100afc1715688fc1a8d2a7e0c167151f6938d45b.

M  +1    -1    bin/CraftSetupHelper.py

https://commits.kde.org/craft/4a0f76c206bbd653dc840535fe3dbf7b64ac7082

diff --git a/bin/CraftSetupHelper.py b/bin/CraftSetupHelper.py
index ff4f5ac5e..d16b94353 100644
--- a/bin/CraftSetupHelper.py
+++ b/bin/CraftSetupHelper.py
@@ -182,7 +182,7 @@ class SetupHelper(object):
 
     @staticmethod
     def stringToEnv(string : str):
-        env = os.environ.copy()
+        env = copy.deepcopy(os.environ)
         for line in string.split("\n"):
             key, value = line.strip().split("=", 1)
             if key == 'Path':


[prev in list] [next in list] [prev in thread] [next in thread]