summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2015-02-18 19:39:40 +0100
committerLennart Poettering <lennart@poettering.net>2015-02-18 19:42:25 +0100
commit8962620e5e7d6a8ffde1fe363f13dd82b1a15661 (patch)
tree710d528c72ffc82d9ade13549250dd3a88792b42 /src
parentf36933fef605a7dccce8e3aecccff5152e522fa6 (diff)
run: if we fail to set a property assignment then really fail
Diffstat (limited to 'src')
-rw-r--r--src/run/run.c9
1 files changed, 2 insertions, 7 deletions
diff --git a/src/run/run.c b/src/run/run.c
index 0661b3bee9..32191a6ac0 100644
--- 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)