SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #1616 from evverx/run-fix-environment-parsing

Browse Source 
run: fix Environment parsing
This commit is contained in:
Lennart Poettering
2015-10-20 15:26:19 +02:00
parent 14a081a0ff e9876fc9c5
commit f73e8b9caf
2 changed files with 53 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/core/dbus-execute.c
+15 -9
View File
@@ -1155,18 +1155,24 @@ int bus_exec_context_set_transient_property(
_cleanup_free_ char *joined = NULL;
char **e;
e = strv_env_merge(2, c->environment, l);
if (!e)
return -ENOMEM;
if (strv_length(l) == 0) {
c->environment = strv_free(c->environment);
unit_write_drop_in_private_format(u, mode, name, "Environment=\n");
} else {
e = strv_env_merge(2, c->environment, l);
if (!e)
return -ENOMEM;
strv_free(c->environment);
c->environment = e;
strv_free(c->environment);
c->environment = e;
joined = strv_join_quoted(c->environment);
if (!joined)
return -ENOMEM;
joined = strv_join_quoted(c->environment);
if (!joined)
return -ENOMEM;
unit_write_drop_in_private_format(u, mode, name, "Environment=%s\n", joined);
}
unit_write_drop_in_private_format(u, mode, name, "Environment=%s\n", joined);
}
return 1;