Author: jkupec Date: Fri May 9 18:00:18 2008 New Revision: 10023 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10023&view=rev Log: - work around bug #388810 - fix progressEnd to say Error on error Modified: trunk/zypper/src/output/OutNormal.cc trunk/zypper/src/zypper-rpm-callbacks.h Modified: trunk/zypper/src/output/OutNormal.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/output/OutNormal.cc?rev=10023&r1=10022&r2=10023&view=diff ============================================================================== --- trunk/zypper/src/output/OutNormal.cc (original) +++ trunk/zypper/src/output/OutNormal.cc Fri May 9 18:00:18 2008 @@ -148,7 +148,7 @@ return; if (isatty(STDOUT_FILENO)) - cout << CLEARLN << label << " [" << _("done") << "]"; + cout << CLEARLN << label << " [" << (error ? _("error") : _("done")) << "]"; else cout << "]"; cout << endl << std::flush; Modified: trunk/zypper/src/zypper-rpm-callbacks.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-rpm-callbacks.h?rev=10023&r1=10022&r2=10023&view=diff ============================================================================== --- trunk/zypper/src/zypper-rpm-callbacks.h (original) +++ trunk/zypper/src/zypper-rpm-callbacks.h Fri May 9 18:00:18 2008 @@ -184,11 +184,14 @@ virtual void finish( zypp::Resolvable::constPtr /*resolvable*/, Error error, const std::string & reason ) { + // the error should have been reported in problem() but it isn't! (bnc #388810) + Zypper::instance()->out().progressEnd("remove-resolvable", _label, error != NO_ERROR); if (error != NO_ERROR) - // don't write to output, the error should have been reported in problem() (bnc #381203) + { + // set proper exit code + Zypper::instance()->out().error(zcb_error2str(error, reason)); Zypper::instance()->setExitCode(ZYPPER_EXIT_ERR_ZYPP); - else - Zypper::instance()->out().progressEnd("remove-resolvable", _label); + } } }; -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org