- renamed cond_load_resolvables -> load_resolvables

diff --git a/src/zypper-repos.cc b/src/zypper-repos.cc
index 0178c68..4e229b9 100644 (file)
--- a/src/zypper-repos.cc
+++ b/src/zypper-repos.cc
@@ -1395,7 +1395,7 @@ void modify_repo(Zypper & zypper, const string & alias)
 
 // ---------------------------------------------------------------------------
 
-void cond_load_resolvables(Zypper & zypper)
+void load_resolvables(Zypper & zypper)
 {
   static bool done = false;
   // don't call this fuction more than once for a single ZYpp instance

diff --git a/src/zypper-repos.h b/src/zypper-repos.h
index 16824df..604d867 100644 (file)
--- a/src/zypper-repos.h
+++ b/src/zypper-repos.h
@@ -103,7 +103,7 @@ void modify_repo(Zypper & zypper, const std::string & alias);
  * \see load_repo_resolvables(bool)
  * \see load_target_resolvables(bool)
  */
-void cond_load_resolvables(Zypper & zypper);
+void load_resolvables(Zypper & zypper);
 
 /**
  * Reads resolvables from the RPM database (installed resolvables) into the pool.

diff --git a/src/zypper.cc b/src/zypper.cc
index 05b70da..0a1a5af 100644 (file)
--- a/src/zypper.cc
+++ b/src/zypper.cc
@@ -1889,7 +1889,7 @@ void Zypper::doCommand()
     // prepare target
     init_target(*this);
     // load metadata
-    cond_load_resolvables(*this);
+    load_resolvables(*this);
 
     // mark resolvables for installation/removal
     bool by_capability = false; // install by name by default
@@ -2037,7 +2037,7 @@ void Zypper::doCommand()
     init_target(*this);
 
     // now load resolvables:
-    cond_load_resolvables(*this);
+    load_resolvables(*this);
 
     Table t;
     t.style(Ascii);
@@ -2096,7 +2096,7 @@ void Zypper::doCommand()
     // TODO calc token?
 
     // now load resolvables:
-    cond_load_resolvables(*this);
+    load_resolvables(*this);
 
     patch_check ();
 
@@ -2131,7 +2131,7 @@ void Zypper::doCommand()
     init_repos(*this);
     if (exitCode() != ZYPPER_EXIT_OK)
       return;
-    cond_load_resolvables(*this);
+    load_resolvables(*this);
     show_patches(*this);
 
     return;
@@ -2173,7 +2173,7 @@ void Zypper::doCommand()
     init_repos(*this);
     if (exitCode() != ZYPPER_EXIT_OK)
       return;
-    cond_load_resolvables(*this);
+    load_resolvables(*this);
 
     list_updates(*this, kind, best_effort );
 
@@ -2191,7 +2191,7 @@ void Zypper::doCommand()
     init_repos(*this);
     if (exitCode() != ZYPPER_EXIT_OK)
       return;
-    cond_load_resolvables(*this);
+    load_resolvables(*this);
 
     cout << "<update-status version=\"0.6\">" << endl;
     cout << "<update-list>" << endl;
@@ -2257,7 +2257,7 @@ void Zypper::doCommand()
     init_repos(*this);
     if (exitCode() != ZYPPER_EXIT_OK)
       return;
-    cond_load_resolvables(*this);
+    load_resolvables(*this);
 
     bool skip_interactive = copts.count("skip-interactive") || globalOpts().non_interactive;
     mark_updates( kind, skip_interactive, best_effort );
@@ -2312,7 +2312,7 @@ void Zypper::doCommand()
     init_repos(*this);
     if (exitCode() != ZYPPER_EXIT_OK)
       return;
-    cond_load_resolvables(*this);
+    load_resolvables(*this);
     zypp::UpgradeStatistics opt_stats;
     God->resolver()->doUpgrade(opt_stats);
 
@@ -2384,7 +2384,7 @@ void Zypper::doCommand()
     init_repos(*this);
     if (exitCode() != ZYPPER_EXIT_OK)
       return;
-    cond_load_resolvables(*this);
+    load_resolvables(*this);
 
     printInfo(*this, kind);