From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 24 Jun 2016 19:03:47 +0000 (+0200)
Subject: systemctl: fix an error condition from "-1" to something meaningful
X-Git-Tag: v231~116^2~3
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=dbf43a1b3a10b8e50eca3866687989ca5b21dabd;p=thirdparty%2Fsystemd.git

systemctl: fix an error condition from "-1" to something meaningful

We really shouldn't make up errors like "-1", but use proper errno definitions.
---

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index 0a8e60c1957..c0b285b58ff 100644
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -6175,7 +6175,7 @@ static int unit_file_create_copy(
                 if (response != 'y') {
                         log_warning("%s ignored", unit_name);
                         free(tmp_new_path);
-                        return -1;
+                        return -EKEYREJECTED;
                 }
         }
 
@@ -6307,10 +6307,8 @@ static int find_paths_to_edit(sd_bus *bus, char **names, char ***paths) {
                                 r = unit_file_create_copy(&lp, *name, path, &new_path, &tmp_path);
                         else
                                 r = unit_file_create_new(&lp, *name, ".d/override.conf", &new_path, &tmp_path);
-                } else {
+                } else
                         r = unit_file_create_new(&lp, *name, NULL, &new_path, &tmp_path);
-                }
-
                 if (r < 0)
                         return r;