Author: jkupec Date: Sun Dec 9 14:02:06 2007 New Revision: 8080 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8080&view=rev Log: - fixed the some shell functionality (#345004) Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-repos.cc trunk/zypper/src/zypper.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=8080&r1=8079&r2=8080&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Sun Dec 9 14:02:06 2007 @@ -425,7 +425,7 @@ // 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 solve_and_commit (Zypper & zypper) { + MIL << "solving..." << endl; + while (true) { bool success = resolve(zypper); if (success) @@ -1504,6 +1506,7 @@ if (!confirm_licenses(zypper)) return; cerr_v << _("committing") << endl; + MIL << "committing..." << endl; try { //! \todo fix the media reporting correctly Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=8080&r1=8079&r2=8080&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Sun Dec 9 14:02:06 2007 @@ -1112,11 +1112,14 @@ 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; } // --------------------------------------------------------------------------- Modified: trunk/zypper/src/zypper.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper.cc?rev=8080&r1=8079&r2=8080&view=diff ============================================================================== --- trunk/zypper/src/zypper.cc (original) +++ trunk/zypper/src/zypper.cc Sun Dec 9 14:02:06 2007 @@ -484,7 +484,8 @@ 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(); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org