Author: jkupec Date: Thu Jul 5 23:15:49 2007 New Revision: 5899 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5899&view=rev Log: member name fix Modified: trunk/zypper/package/zypper.changes trunk/zypper/src/zypper.cc trunk/zypper/src/zypper.h Modified: trunk/zypper/package/zypper.changes URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/package/zypper.changes?rev=5899&r1=5898&r2=5899&view=diff ============================================================================== --- trunk/zypper/package/zypper.changes (original) +++ trunk/zypper/package/zypper.changes Thu Jul 5 23:15:49 2007 @@ -4,7 +4,7 @@ - --silent global option added. Use cout_n for normal program output which should be suppressed by --silent option. - some output clean-up (still work to do) -- r5898 +- r5899 ------------------------------------------------------------------- Tue Jul 3 13:34:09 CEST 2007 - jkupec@suse.cz Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=5899&r1=5898&r2=5899&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Thu Jul 5 23:15:49 2007 @@ -148,14 +148,14 @@ ; if (gopts.count("silent")) { - gSettings.verbose = -1; - DBG << "Verbosity " << gSettings.verbose << endl; + gSettings.verbosity = -1; + DBG << "Verbosity " << gSettings.verbosity << endl; } if (gopts.count("verbose")) { - gSettings.verbose += gopts["verbose"].size(); - cout << _("Verbosity ") << gSettings.verbose << endl; - DBG << _("Verbosity ") << gSettings.verbose << endl; + gSettings.verbosity += gopts["verbose"].size(); + cout << _("Verbosity ") << gSettings.verbosity << endl; + DBG << _("Verbosity ") << gSettings.verbosity << endl; } if (gopts.count("non-interactive")) { Modified: trunk/zypper/src/zypper.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.h?rev=5899&r1=5898&r2=5899&view=diff ============================================================================== --- trunk/zypper/src/zypper.h (original) +++ trunk/zypper/src/zypper.h Thu Jul 5 23:15:49 2007 @@ -43,7 +43,7 @@ { Settings() : previous_token(RANDOM_TOKEN), - verbose(0), + verbosity(0), previous_code(-1), disable_system_sources(false), disable_system_resolvables(false), @@ -65,7 +65,7 @@ * <li> 2 debug</li> * </ul> */ - int verbose; + int verbosity; int previous_code; std::string command; bool disable_system_sources; @@ -106,9 +106,9 @@ * Macro to filter output above the current verbosity level. * * \see Output Macros - * \see Settings::verbose + * \see Settings::verbosity */ -#define COND_STREAM(STREAM,LEVEL) ((gSettings.verbose >= LEVEL) ? STREAM : no_stream) +#define COND_STREAM(STREAM,LEVEL) ((gSettings.verbosity >= LEVEL) ? STREAM : no_stream) /** \name Output Macros * Alway use these macros to produce output so that the verbosity options -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org