renamed --silent to --quiet (rug compatible)

diff --git a/doc/zypper.8 b/doc/zypper.8
index 0ed3b88..6786444 100644 (file)
--- a/doc/zypper.8
+++ b/doc/zypper.8
@@ -234,7 +234,7 @@ Print zypper version number and exit.
 .I \-v, \-\-verbose
 Increase verbosity. For debugging output specify this option twice.
 .TP
-.I \-S, \-\-silent
+.I \-q, \-\-quiet
 Suppress normal output. Brief error messages will still be printed on standard error output. If used together with conflicting --verbose option, the --verbose option takes preference.
 .TP
 .I \-t, \-\-terse

diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index e896cbf..11b9ded 100644 (file)
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -578,7 +578,7 @@ void show_patches()
   if (tbl.empty())
     cout_n << _("No needed patches found.") << endl;
   else
-    // display the result, even if --silent specified
+    // display the result, even if --quiet specified
     cout << tbl;
 }
 

diff --git a/src/zypper.cc b/src/zypper.cc
index 2dd48c1..a04d9ed 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -57,7 +57,7 @@ DigestCallbacks digest_callbacks;
 static struct option global_options[] = {
   {"help",     no_argument, 0, 'h'},
   {"verbose",  no_argument, 0, 'v'},
-  {"silent",   no_argument, 0, 'S'},
+  {"quiet",    no_argument, 0, 'q'},
   {"version",  no_argument, 0, 'V'},
   {"terse",    no_argument, 0, 't'},
   {"table-style", required_argument, 0, 's'},
@@ -136,18 +136,18 @@ ZypperCommand process_globals(int argc, char **argv)
     ghelp = true;
 
   string help_global_options = _("  Options:\n"
-    "\t--help, -h\t\tHelp\n"
-    "\t--version, -V\t\tOutput the version number\n"
-    "\t--silent, -S\t\tSuppress normal output\n"
-    "\t--verbose, -v\t\tIncrease verbosity\n"
-    "\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. (under development)\n"
-    "\t--root, -R <dir>\tOperate on a different root directory\n");
+    "\t--help, -h\t\tHelp.\n"
+    "\t--version, -V\t\tOutput the version number.\n"
+    "\t--quiet, -q\t\tSuppress normal output, print only error messages.\n"
+    "\t--verbose, -v\t\tIncrease verbosity.\n"
+    "\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. (under development).\n"
+    "\t--root, -R <dir>\tOperate on a different root directory.\n");
     ;
   
-  if (gopts.count("silent")) {
+  if (gopts.count("quiet")) {
     gSettings.verbosity = -1;
     DBG << "Verbosity " << gSettings.verbosity << endl;
   }

diff --git a/src/zypper.h b/src/zypper.h
index 2edf532..1c9e62b 100644 (file)
--- a/src/zypper.h
+++ b/src/zypper.h
@@ -59,7 +59,7 @@ struct Settings
    * Level of the amount of output.
    *
    * <ul> 
-   * <li>-1 silent</li>
+   * <li>-1 quiet</li>
    * <li> 0 normal (default)</li>
    * <li> 1 verbose</li>
    * <li> 2 debug</li>
@@ -112,9 +112,9 @@ extern std::ostream no_stream;
 
 /** \name Output Macros
  * Alway use these macros to produce output so that the verbosity options
- * like -v or --silent are respected. Use standard cout and cerr only in
+ * like -v or --quiet are respected. Use standard cout and cerr only in
  * cases where it is desirable to ignore them (e.g. help texts (when -h is
- * used) or brief error messages must always be displayed, even if --silent
+ * used) or brief error messages must always be displayed, even if --quiet
  * has been specified).
  */
 //!@{