From: Daniel Hahler <github@thequod.de>
Date: Tue, 16 Aug 2016 16:42:41 +0000 (+0200)
Subject: zsh: _journalctl: do not complete exclusive modes (#3957)
X-Git-Tag: v232~297
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=ba89f80620d619867b4838973785d529c5a959f6;p=thirdparty%2Fsystemd.git

zsh: _journalctl: do not complete exclusive modes (#3957)

After `journalctl -D /var/log/journal` "--directory", "--file",
"--machine" and "--root" should not be available for completion, because
they are exclusive.  But multiple `--file` arguments are allowed.
---

diff --git a/shell-completion/zsh/_journalctl b/shell-completion/zsh/_journalctl
index e6549e863f1..610788dcce9 100644
--- a/shell-completion/zsh/_journalctl
+++ b/shell-completion/zsh/_journalctl
@@ -96,10 +96,10 @@ _arguments -s \
     {-F,--field=}'[List all values a certain field takes]:Fields:_list_fields' \
     '--system[Show system and kernel messages]' \
     '--user[Show messages from user services]' \
-    {-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
-    {-D+,--directory=}'[Show journal files from directory]:directories:_directories' \
-    '--file=[Operate on specified journal files]:file:_files' \
-    '--root=[Operate on catalog hierarchy under specified directory]:directories:_directories' \
+    '(--directory -D -M --machine --root --file)'{-M+,--machine=}'[Operate on local container]:machines:_sd_machines' \
+    '(--directory -D -M --machine --root --file)'{-D+,--directory=}'[Show journal files from directory]:directories:_directories' \
+    '(--directory -D -M --machine --root --file)''--root=[Operate on catalog hierarchy under specified directory]:directories:_directories' \
+    '(--directory -D -M --machine --root)--file=[Operate on specified journal files]:file:_files' \
     '--new-id128[Generate a new 128 Bit ID]' \
     '--header[Show journal header information]' \
     '--disk-usage[Show total disk usage]' \