From: Jan Kupec <jkupec@suse.cz>
Date: Thu, 5 Jul 2007 21:15:49 +0000 (+0000)
Subject: member name fix
X-Git-Tag: BASE-SuSE-Linux-10_3-Branch~302
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=a50d69141b872868ed2acaf4deb5f588456ae1b5;p=platform%2Fupstream%2Fzypper.git

member name fix
---

diff --git a/package/zypper.changes b/package/zypper.changes
index 50c6c07..384d6ca 100644
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -4,7 +4,7 @@ Thu Jul  5 23:06:49 CEST 2007 - jkupec@suse.cz
 - --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
diff --git a/src/zypper.cc b/src/zypper.cc
index a2e7f2e..2dd48c1 100644
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -148,14 +148,14 @@ ZypperCommand process_globals(int argc, char **argv)
     ;
   
   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")) {
diff --git a/src/zypper.h b/src/zypper.h
index afdf43a..2edf532 100644
--- a/src/zypper.h
+++ b/src/zypper.h
@@ -43,7 +43,7 @@ struct Settings
 {
   Settings()
   : previous_token(RANDOM_TOKEN),
-  verbose(0),  
+  verbosity(0),  
   previous_code(-1),
   disable_system_sources(false),
   disable_system_resolvables(false),
@@ -65,7 +65,7 @@ struct Settings
    * <li> 2 debug</li>
    * </ul>
    */
-  int verbose;
+  int verbosity;
   int previous_code;
   std::string command;
   bool disable_system_sources;
@@ -106,9 +106,9 @@ extern std::ostream no_stream;
  * 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