From: Lennart Poettering <lennart@poettering.net>
Date: Mon, 25 Apr 2016 09:57:56 +0000 (+0200)
Subject: journalctl: turn --unit= in combination with --user into --user-unit=
X-Git-Tag: v230~133^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3109%2Fhead;p=thirdparty%2Fsystemd.git

journalctl: turn --unit= in combination with --user into --user-unit=

Let's be nice to users, and let's turn the nonsensical "--unit=… --user" into
"--user-unit=…" which the user more likely meant.

Fixes #1621
---

diff --git a/src/journal/journalctl.c b/src/journal/journalctl.c
index ae62170ae59..6de3489e123 100644
--- a/src/journal/journalctl.c
+++ b/src/journal/journalctl.c
@@ -873,6 +873,18 @@ static int parse_argv(int argc, char *argv[]) {
                 return -EINVAL;
         }
 
+        if (!strv_isempty(arg_system_units) && (arg_journal_type == SD_JOURNAL_CURRENT_USER)) {
+
+                /* Specifying --user and --unit= at the same time makes no sense (as the former excludes the user
+                 * journal, but the latter excludes the system journal, thus resulting in empty output). Let's be nice
+                 * to users, and automatically turn --unit= into --user-unit= if combined with --user. */
+                r = strv_extend_strv(&arg_user_units, arg_system_units, true);
+                if (r < 0)
+                        return -ENOMEM;
+
+                arg_system_units = strv_free(arg_system_units);
+        }
+
         return 1;
 }