Author: mvidner Date: Fri May 4 15:47:07 2007 New Revision: 5487 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5487&view=rev Log: Merged revisions 3766 via svnmerge from http://svn.opensuse.org/svn/zypp/branches/SuSE-SLE-10-Branch/backend ........ r3766 | kkaempf | 2006-07-05 21:50:32 +0200 (St, 05 čec 2006) | 2 lines only report real errors to ZMD (#190338) ........ Modified: branches/SuSE-SLE-10-GA-Branch/backend/ (props changed) branches/SuSE-SLE-10-GA-Branch/backend/src/RpmCallbacks.h Modified: branches/SuSE-SLE-10-GA-Branch/backend/src/RpmCallbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-SLE-10-GA-Branch/backend/src/RpmCallbacks.h?rev=5487&r1=5486&r2=5487&view=diff ============================================================================== --- branches/SuSE-SLE-10-GA-Branch/backend/src/RpmCallbacks.h (original) +++ branches/SuSE-SLE-10-GA-Branch/backend/src/RpmCallbacks.h Fri May 4 15:47:07 2007 @@ -104,10 +104,26 @@ virtual void finish(zypp::Resolvable::constPtr resolvable, Error error, std::string reason, zypp::target::rpm::InstallResolvableReport::RpmLevel level) { -DBG << "finish(" << *resolvable << "," << reason << ")" << std::endl; - if (level == zypp::target::rpm::InstallResolvableReport::RPM_NODEPS_FORCE) { - std::cout << "3|" << reason << std::endl; +DBG << "finish(" << *resolvable << "," << error << ", " << reason << ")" << std::endl; + string errmsg; + switch (error) { + case NO_ERROR: + return; + break; + case NOT_FOUND: + errmsg = "Package not found"; + break; + case IO: + errmsg = "I/O error"; + break; + case INVALID: + errmsg = "Invalid package"; + break; + } + if (level == RPM_NODEPS_FORCE) { + std::cout << "3|" << errmsg << ": " << reason << std::endl; } + return; } }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org