From 1a4e801ae48dd23c64134995728c0c77a55346c9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fatih=20A=C5=9F=C4=B1c=C4=B1?= Date: Tue, 16 Jun 2009 08:29:07 +0000 Subject: [PATCH] Fix here too --- ChangeLog | 2 +- pisi/actionsapi/variables.py | 5 ++--- pisi/operations/build.py | 1 - 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a7e38722..84604c92 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,5 @@ 2009-06-16 Fatih Aşıcı - * (operations/build.py): Fix resetting of the environment. + * Fix resetting of the environment. 2009-06-06 Ozan Çağlayan * (operations/build.py): Sort the files according to their path names diff --git a/pisi/actionsapi/variables.py b/pisi/actionsapi/variables.py index 7c1d0717..7e7d0a52 100644 --- a/pisi/actionsapi/variables.py +++ b/pisi/actionsapi/variables.py @@ -11,7 +11,6 @@ # Standard Python Modules import os -from copy import deepcopy # Pisi-Core Modules import pisi.context as ctx @@ -22,8 +21,8 @@ def exportFlags(): '''General flags used in actions API.''' # first reset environ - os.environ = {} - os.environ = deepcopy(ctx.config.environ) + os.environ.clear() + os.environ.update(ctx.config.environ) # Build systems depend on these environment variables. That is why # we export them instead of using as (instance) variables. diff --git a/pisi/operations/build.py b/pisi/operations/build.py index 8c935a73..8b9c6f87 100644 --- a/pisi/operations/build.py +++ b/pisi/operations/build.py @@ -16,7 +16,6 @@ import os import re import sys import glob -import copy import stat import pwd import grp