Author: jkupec Date: Thu Jul 5 23:34:40 2007 New Revision: 5900 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5900&view=rev Log: renamed --silent to --quiet (rug compatible) Modified: trunk/zypper/doc/zypper.8 trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/doc/zypper.8 URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/doc/zypper.8?rev=5900&r1=5899&r2=5900&view=diff ============================================================================== --- trunk/zypper/doc/zypper.8 (original) +++ trunk/zypper/doc/zypper.8 Thu Jul 5 23:34:40 2007 @@ -234,7 +234,7 @@ .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 Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=5900&r1=5899&r2=5900&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Thu Jul 5 23:34:40 2007 @@ -578,7 +578,7 @@ 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; } Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=5900&r1=5899&r2=5900&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Thu Jul 5 23:34:40 2007 @@ -57,7 +57,7 @@ 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 @@ 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; } Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=5900&r1=5899&r2=5900&view=diff ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Thu Jul 5 23:34:40 2007 @@ -59,7 +59,7 @@ * 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 @@ /** \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). */ //!@{ -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org