38 lines
1.5 KiB
Diff
38 lines
1.5 KiB
Diff
From eb6c7d20756b60a7c79a373fd27a682a31b5647a Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Date: Wed, 3 Sep 2014 22:22:38 -0400
|
|
Subject: [PATCH] systemd: fix argument ordering in UnsetAndSetEnvironment
|
|
|
|
Fixup for v208-615-g718db96199.
|
|
---
|
|
src/core/dbus-manager.c | 8 ++++----
|
|
1 file changed, 4 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/core/dbus-manager.c b/src/core/dbus-manager.c
|
|
index e792fe7e28..2fe9d193f6 100644
|
|
--- a/src/core/dbus-manager.c
|
|
+++ b/src/core/dbus-manager.c
|
|
@@ -1357,18 +1357,18 @@ static int method_unset_and_set_environment(sd_bus *bus, sd_bus_message *message
|
|
if (r < 0)
|
|
return r;
|
|
|
|
- r = sd_bus_message_read_strv(message, &plus);
|
|
+ r = sd_bus_message_read_strv(message, &minus);
|
|
if (r < 0)
|
|
return r;
|
|
|
|
- r = sd_bus_message_read_strv(message, &minus);
|
|
+ r = sd_bus_message_read_strv(message, &plus);
|
|
if (r < 0)
|
|
return r;
|
|
|
|
- if (!strv_env_is_valid(plus))
|
|
- return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid environment assignments");
|
|
if (!strv_env_name_or_assignment_is_valid(minus))
|
|
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid environment variable names or assignments");
|
|
+ if (!strv_env_is_valid(plus))
|
|
+ return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS, "Invalid environment assignments");
|
|
|
|
r = manager_environment_add(m, minus, plus);
|
|
if (r < 0)
|