Removed keepExtra parameter in resolvePool; Bug 294727

diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index b485b3d..a2324fa 100644 (file)
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -542,13 +542,10 @@ void establish ()
   dump_pool ();
 }
 
-bool resolve( bool have_extra_deps )
+bool resolve()
 {
   establish ();
   cout_v << _("Resolving dependencies...") << endl;
-  if (have_extra_deps)
-    return God->resolver()->resolvePool( true, true );
-
   return God->resolver()->resolvePool();
 }
 
@@ -1068,9 +1065,9 @@ void mark_updates( const ResObject::Kind &kind, const std::string &repo_alias, b
  *  ZYPPER_EXIT_INF_REBOOT_NEEDED - if one of patches to be installed needs machine reboot,
  *  ZYPPER_EXIT_INF_RESTART_NEEDED - if one of patches to be installed needs package manager restart
  */
-int solve_and_commit (bool have_extra_deps ) {
+int solve_and_commit () {
   while (true) {
-    bool success = resolve( have_extra_deps );
+    bool success = resolve();
     if (success)
       break;
 

diff --git a/src/zypper-misc.h b/src/zypper-misc.h
index 165f06e..68987cf 100644 (file)
--- a/src/zypper-misc.h
+++ b/src/zypper-misc.h
@@ -58,7 +58,7 @@ void load_target_resolvables();
 void load_repo_resolvables();
 
 void establish ();
-bool resolve( bool have_extra_deps = false );
+bool resolve();
 void dump_pool ();
 void show_patches();
 void xml_list_patches();
@@ -89,7 +89,7 @@ void usage(int argc, char **argv);
  *         or ZYPPER_EXIT_OK or ZYPPER_EXIT_ERR_ZYPP on zypp erorr. 
  *  
  */
-int solve_and_commit (bool have_extra_deps = false);
+int solve_and_commit ();
 
 /**
  * Loops through resolvables, checking if there is license to confirm. When

diff --git a/src/zypper.cc b/src/zypper.cc
index c52131d..8f0f1ee 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -1003,7 +1003,7 @@ int one_command(const ZypperCommand & command, int argc, char **argv)
       }
     }
     else
-      return solve_and_commit (!just_name);
+      return solve_and_commit ();
 
     return ZYPPER_EXIT_OK;
   }
@@ -1225,7 +1225,7 @@ int one_command(const ZypperCommand & command, int argc, char **argv)
     // returns ZYPPER_EXIT_OK, ZYPPER_EXIT_ERR_ZYPP,
     // ZYPPER_EXIT_INF_REBOOT_NEEDED, or ZYPPER_EXIT_INF_RESTART_NEEDED
     else
-      return solve_and_commit(best_effort);
+      return solve_and_commit();
 
     return ZYPPER_EXIT_OK; 
   }