Call dump_pool more often for better debugging.

diff --git a/VERSION b/VERSION
index dc14e8d..40e6cec 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -2,9 +2,13 @@ dnl ==================================================
 dnl Versioning
 dnl ==========
 dnl
-dnl
+dnl For now:
+dnl - bump PATCH at least for each submission
+dnl - bump MINOR and reset PATCH when a significant bug is fixed or
+dnl   a feature added (but we should not add them now in the beta
+dnl   phase)
 dnl ==================================================
 m4_define([ZYPPER_MAJOR],       [0])
 m4_define([ZYPPER_MINOR],       [6])
-m4_define([ZYPPER_PATCH],       [4])
+m4_define([ZYPPER_PATCH],       [5])
 dnl ==================================================

diff --git a/package/zypper.changes b/package/zypper.changes
index 5ca5a6c..0652ec0 100644 (file)
--- a/package/zypper.changes
+++ b/package/zypper.changes
@@ -1,4 +1,10 @@
 -------------------------------------------------------------------
+Wed Nov  8 09:55:56 CET 2006 - mvidner@suse.cz
+
+- Call dump_pool more often for better debugging.
+- 0.6.5
+
+-------------------------------------------------------------------
 Tue Nov  7 13:16:28 CET 2006 - jkupec@suse.cz
 
 - --help option added for each command

diff --git a/src/zmart-misc.cc b/src/zmart-misc.cc
index 20e90aa..6941c16 100644 (file)
--- a/src/zmart-misc.cc
+++ b/src/zmart-misc.cc
@@ -330,6 +330,7 @@ void establish ()
 {
   cerr_v << "Establishing status of aggregates" << endl;
   God->resolver()->establishPool();
+  dump_pool ();
 }
 
 void resolve()
@@ -379,7 +380,7 @@ string string_status (const ResStatus& rs)
   return "error";
 }
 
-static void dump_pool ()
+void dump_pool ()
 {
   int count = 1;
   static bool full_pool_shown = false;
@@ -402,7 +403,6 @@ static void dump_pool ()
 void show_patches()
 {
   MIL << "Pool contains " << God->pool().size() << " items. Checking whether available patches are needed." << std::endl;
-  dump_pool ();
 
   Table tbl;
   TableHeader th;
@@ -591,7 +591,6 @@ void mark_updates( const ResObject::Kind &kind )
 }
 
 void solve_and_commit (bool non_interactive) {
-  cerr_v << "resolving" << endl;
   resolve();
     
   show_problems ();

diff --git a/src/zmart-misc.h b/src/zmart-misc.h
index c63b262..c2830e2 100644 (file)
--- a/src/zmart-misc.h
+++ b/src/zmart-misc.h
@@ -33,6 +33,7 @@ void load_target();
 void load_sources();
 void establish ();
 void resolve();
+void dump_pool ();
 void show_patches();
 void patch_check();
 void list_updates( const zypp::ResObject::Kind &kind );

diff --git a/src/zypper.cc b/src/zypper.cc
index 792d96e..7e2bf2f 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -400,6 +400,17 @@ int one_command(const string& command, int argc, char **argv)
       "'patch-info' - Show detailed information for patches\n"
       ;
   }
+  else if (command == "moo") {
+    static struct option moo_options[] = {
+      {"help", no_argument, 0, 'h'}
+    };
+    specific_options = moo_options;
+    specific_help =
+      "zypper [global-options] moo\n"
+      "\n"
+      "'moo' - Show an animal\n"
+      ;
+  }
   else if (!command.empty()) { // empty command is treated earlier
     cerr << "Unknown command '" << command << "'." << endl << endl;
     cerr << help_commands;