From 4cd04bdeb5a3eef1980892dc31950e174db80d42 Mon Sep 17 00:00:00 2001
From: Jan Kupec <jkupec@suse.cz>
Date: Sun, 9 Dec 2007 13:02:06 +0000
Subject: [PATCH] - fixed the some shell functionality (#345004)

---
 src/zypper-misc.cc  | 5 ++++-
 src/zypper-repos.cc | 3 +++
 src/zypper.cc       | 3 ++-
 3 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index 1b17798..7f3e92c 100644
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -425,7 +425,7 @@ void remove_selections(Zypper & zypper)
   // TODO optimize: it seems this is actually needed only if the selection was
   //      not committed (user has chosen not to continue)
   const ResPool & pool = God->pool();
-  cout << "pool size" << pool.size() << endl;
+
   for (ResPool::const_iterator it = pool.begin(); it != pool.end(); ++it)
     if (it->status().isByUser())
     {
@@ -1481,6 +1481,8 @@ void mark_updates( const ResObject::Kind &kind, bool skip_interactive, bool best
  */
 void solve_and_commit (Zypper & zypper)
 {
+  MIL << "solving..." << endl;
+
   while (true) {
     bool success = resolve(zypper);
     if (success)
@@ -1504,6 +1506,7 @@ void solve_and_commit (Zypper & zypper)
       if (!confirm_licenses(zypper)) return;
 
       cerr_v << _("committing") << endl;
+      MIL << "committing..." << endl;
 
       try {
         //! \todo fix the media reporting correctly
diff --git a/src/zypper-repos.cc b/src/zypper-repos.cc
index eae0c29..735a831 100644
--- a/src/zypper-repos.cc
+++ b/src/zypper-repos.cc
@@ -1112,11 +1112,14 @@ void cond_load_resolvables(Zypper & zypper, bool to_pool)
   if (done)
     return;
 
+  MIL << "Going to load resolvables" << endl;
+
   load_repo_resolvables(zypper, to_pool);
   if (!zypper.globalOpts().disable_system_resolvables && to_pool)
     load_target_resolvables(zypper);
 
   done = true;
+  MIL << "Done loading resolvables" << endl;
 }
 
 // ---------------------------------------------------------------------------
diff --git a/src/zypper.cc b/src/zypper.cc
index 5e29736..6bc6092 100644
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -484,7 +484,8 @@ void Zypper::shellCleanup()
   setRunningHelp(false);
   // reset the exitting flag
   exit(false);
-  // ... and the exit code does not matter in the shell
+  // ... and the exit code
+  setExitCode(ZYPPER_EXIT_OK);
 
   // gData
   gData.current_repo = RepoInfo();
-- 
2.7.4