systemctl: return r instead of always returning 0

[elogind.git] / src / systemctl / systemctl.c

diff --git a/src/systemctl/systemctl.c b/src/systemctl/systemctl.c
index b75f335ae9be30a7959a6f82a84220e4a4487099..631cd3df53b9b98e775ffe5777e5511e47e156bb 100644 (file)
--- a/src/systemctl/systemctl.c
+++ b/src/systemctl/systemctl.c
@@ -1258,12 +1258,11 @@ static void list_jobs_print(struct job_info* jobs, size_t n) {
                         shorten = true;
                 }
 
-                if (on_tty())
-                        printf("%*s %-*s %-*s %-*s\n",
-                               l0, "JOB",
-                               l1, "UNIT",
-                               l2, "TYPE",
-                               l3, "STATE");
+                printf("%*s %-*s %-*s %-*s\n",
+                       l0, "JOB",
+                       l1, "UNIT",
+                       l2, "TYPE",
+                       l3, "STATE");
 
                 for (i = 0, j = jobs; i < n; i++, j++) {
                         _cleanup_free_ char *e = NULL;
@@ -1286,8 +1285,7 @@ static void list_jobs_print(struct job_info* jobs, size_t n) {
         on = ansi_highlight();
         off = ansi_highlight_off();
 
-        if (on_tty())
-                printf("\n%s%zu jobs listed%s.\n", on, n, off);
+        printf("\n%s%zu jobs listed%s.\n", on, n, off);
 }
 
 static int list_jobs(DBusConnection *bus, char **args) {
@@ -1367,7 +1365,7 @@ static int list_jobs(DBusConnection *bus, char **args) {
         }
         free(jobs);
 
-        return 0;
+        return r;
 }
 
 static int cancel_job(DBusConnection *bus, char **args) {