Author: jkupec Date: Thu Aug 9 21:43:23 2007 New Revision: 6556 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6556&view=rev Log: - more 'Invalid object' msg clean-up (#216042) Modified: trunk/zypper/src/zypper-rpm-callbacks.h Modified: trunk/zypper/src/zypper-rpm-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-rpm-callbacks.h?rev=6556&r1=6555&r2=6556&view=diff ============================================================================== --- trunk/zypper/src/zypper-rpm-callbacks.h (original) +++ trunk/zypper/src/zypper-rpm-callbacks.h Thu Aug 9 21:43:23 2007 @@ -174,24 +174,23 @@ struct InstallResolvableReportReceiver : public zypp::callback::ReceiveReportzypp::target::rpm::InstallResolvableReport { zypp::Resolvable::constPtr _resolvable; - + void display_step( zypp::Resolvable::constPtr resolvable, int value ) { // TranslatorExplanation This text is a progress display label e.g. "Installing [42%]" - stringstream s; - s << (boost::format(_("Installing: %s-%s")) + string s = boost::str(boost::format(_("Installing: %s-%s")) % resolvable->name() % resolvable->edition()); - display_progress ( "install-resolvable", cout, s.str(), value); + display_progress ( "install-resolvable", cout, s, value); } virtual void start( zypp::Resolvable::constPtr resolvable ) { _resolvable = resolvable; - stringstream s; - s << (boost::format(_("Installing: %s-%s")) + string s = + boost::str(boost::format(_("Installing: %s-%s")) % resolvable->name() % resolvable->edition()); - display_progress ( "install-resolvable", cout, s.str(), 0); + display_progress ( "install-resolvable", cout, s, 0); } virtual bool progress(int value, zypp::Resolvable::constPtr resolvable) @@ -219,11 +218,20 @@ virtual void finish( zypp::Resolvable::constPtr /*resolvable*/, Error error, const std::string & reason, RpmLevel level ) { - display_done ( "install-resolvable", cout); - if (error != NO_ERROR) { - cerr << level; + if (error != NO_ERROR && level < RPM_NODEPS_FORCE) + { + DBG << "level < RPM_NODEPS_FORCE: aborting without displaying an error" + << endl; + return; + } + + display_done ("install-resolvable", cout); + + if (error != NO_ERROR) + { + cerr << level << " "; + display_error (error, reason); } - display_error (error, reason); } }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org