chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
f36933f
)
run: if we fail to set a property assignment then really fail
author
Lennart Poettering
<lennart@poettering.net>
Wed, 18 Feb 2015 18:39:40 +0000
(19:39 +0100)
committer
Lennart Poettering
<lennart@poettering.net>
Wed, 18 Feb 2015 18:42:25 +0000
(19:42 +0100)
src/run/run.c
patch
|
blob
|
history
diff --git
a/src/run/run.c
b/src/run/run.c
index 0661b3bee9c26cdd184c96fb4cd097692233afbc..32191a6ac0444643f69bf6eb740d39317ffb5bea 100644
(file)
--- a/
src/run/run.c
+++ b/
src/run/run.c
@@
-241,14
+241,12
@@
static int parse_argv(int argc, char *argv[]) {
break;
case ARG_SETENV:
-
if (strv_extend(&arg_environment, optarg) < 0)
return log_oom();
break;
case 'p':
-
if (strv_extend(&arg_property, optarg) < 0)
return log_oom();
@@
-389,11
+387,8
@@
static int transient_unit_set_properties(sd_bus_message *m, char **properties) {
return r;
r = bus_append_unit_property_assignment(m, *i);
- if (r < 0) {
- r = sd_bus_message_append(m, "sv", 0);
- if (r < 0)
- return r;
- }
+ if (r < 0)
+ return r;
r = sd_bus_message_close_container(m);
if (r < 0)