- -n shorthand added for --non-interactive

diff --git a/doc/zypper.8 b/doc/zypper.8
index 7da7580..d026a02 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -309,7 +309,7 @@ Print zypper version number and exit.
 Increase verbosity. For debugging output specify this option twice.
 .TP
 .I \-q, \-\-quiet
-Suppress normal output. Brief messages will still be printed though. If used together with conflicting --verbose option, the --verbose option takes preference.
+Suppress normal output. Brief (esp. result notification) messages and error messages will still be printed, though. If used together with conflicting --verbose option, the --verbose option takes preference.
 .TP
 .I \-t, \-\-terse
 Terse output for machine consumption.
@@ -320,8 +320,8 @@ Specifies table style to use. Table style is identified by an integer number. TO
 .I \-r, \-\-rug\-compatible
 Turns on rug compatibility. See compatibility notes next to affected commands.
 .TP
-.I      \-\-non\-interactive
-Switches to non-interactive mode. In this mode zypper doesn't ask user to type answers to various prompts, but uses default answers automatically.
+.I \-n, \-\-non\-interactive
+Switches to non-interactive mode. In this mode zypper doesn't ask user to type answers to various prompts, but uses default answers automatically. The behaviour of this option is somewhat different than that of options like '--yes', since zypper can answer different answers to different questions. The answers also depend on other options like '--no-gpg-checks'.
 .TP
 .I      \-\-no\-gpg\-checks
 Ignore GPG check failures and continue. If a GPG issue occurs when using this option zypper prints and logs a warning and automatically continues without interrupting the operation. Use this option with causion, as you can easily overlook security problems by using it.

diff --git a/src/zypper.cc b/src/zypper.cc
index 39e97e5..2198b27 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -93,7 +93,7 @@ ZypperCommand process_globals(int argc, char **argv)
     {"terse",           no_argument,       0, 't'},
     {"table-style",     required_argument, 0, 's'},
     {"rug-compatible",  no_argument,       0, 'r'},
-    {"non-interactive", no_argument,       0, 0},
+    {"non-interactive", no_argument,       0, 'n'},
     {"no-gpg-checks",   no_argument,       0, 0},
     {"root",            required_argument, 0, 'R'},
     {"opt",             optional_argument, 0, 'o'},
@@ -114,10 +114,10 @@ ZypperCommand process_globals(int argc, char **argv)
     "\t--terse, -t\t\tTerse output for machine consumption.\n"
     "\t--table-style, -s\tTable style (integer).\n"
     "\t--rug-compatible, -r\tTurn on rug compatibility.\n"
-    "\t--non-interactive\tDon't ask anything, use default answers automatically.\n"
+    "\t--non-interactive, -n\tDon't ask anything, use default answers automatically.\n"
     "\t--no-gpg-checks\t\tIgnore GPG check failures and continue.\n"
     "\t--root, -R <dir>\tOperate on a different root directory.\n");
-  
+
   static string help_commands = _(
     "  Commands:\n"
     "\thelp\t\t\tHelp\n"