From f6b2da0a717c495da57e6978d7ab7e0ada5640dd Mon Sep 17 00:00:00 2001 From: Michael Lotz Date: Sat, 22 Aug 2015 17:17:16 +0200 Subject: [PATCH] launch_daemon: Add env vars from sourced files to correct list. The environment variables were always added to the static environment list instead of the one supplied as argument. This worked for targets, as there the scripts are evaluated before the static environment is used. For services and jobs this isn't the case, causing sourced environment variables to be missing. --- src/servers/launch/BaseJob.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/servers/launch/BaseJob.cpp b/src/servers/launch/BaseJob.cpp index 555375e3a9..3dc5d93b25 100644 --- a/src/servers/launch/BaseJob.cpp +++ b/src/servers/launch/BaseJob.cpp @@ -172,7 +172,7 @@ BaseJob::GetSourceFilesEnvironment(BStringList& environment) { int32 count = fSourceFiles.CountStrings(); for (int32 index = 0; index < count; index++) { - _GetSourceFileEnvironment(fSourceFiles.StringAt(index), fEnvironment); + _GetSourceFileEnvironment(fSourceFiles.StringAt(index), environment); } }