Author: jkupec Date: Mon Feb 25 17:54:07 2008 New Revision: 8906 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8906&view=rev Log: - renamed cond_load_resolvables -> load_resolvables Modified: trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper-repos.h trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=8906&r1=8905&r2=8906&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Mon Feb 25 17:54:07 2008 @@ -1395,7 +1395,7 @@ // --------------------------------------------------------------------------- -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 Modified: trunk/zypper/src/zypper-repos.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.h?rev=8906&r1=8905&r2=8906&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.h (original) +++ trunk/zypper/src/zypper-repos.h Mon Feb 25 17:54:07 2008 @@ -103,7 +103,7 @@ * \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. Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8906&r1=8905&r2=8906&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Mon Feb 25 17:54:07 2008 @@ -1889,7 +1889,7 @@ // 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 @@ init_target(*this); // now load resolvables: - cond_load_resolvables(*this); + load_resolvables(*this); Table t; t.style(Ascii); @@ -2096,7 +2096,7 @@ // TODO calc token? // now load resolvables: - cond_load_resolvables(*this); + load_resolvables(*this); patch_check (); @@ -2131,7 +2131,7 @@ init_repos(*this); if (exitCode() != ZYPPER_EXIT_OK) return; - cond_load_resolvables(*this); + load_resolvables(*this); show_patches(*this); return; @@ -2173,7 +2173,7 @@ 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 @@ init_repos(*this); if (exitCode() != ZYPPER_EXIT_OK) return; - cond_load_resolvables(*this); + load_resolvables(*this); cout << "" << endl; cout << "<update-list>" << endl; @@ -2257,7 +2257,7 @@ 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 @@ 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 @@ init_repos(*this); if (exitCode() != ZYPPER_EXIT_OK) return; - cond_load_resolvables(*this); + load_resolvables(*this); printInfo(*this, kind); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org