Author: jkupec Date: Tue Mar 4 16:07:34 2008 New Revision: 9000 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9000&view=rev Log: - appropriate error message for problems with rpm database during reading installed packages or after installation (bnc #364370) Modified: trunk/zypper/src/zypper-misc.cc trunk/zypper/src/zypper-repos.cc Modified: trunk/zypper/src/zypper-misc.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-misc.cc?rev=9000&r1=8999&r2=9000&view=diff ============================================================================== --- trunk/zypper/src/zypper-misc.cc (original) +++ trunk/zypper/src/zypper-misc.cc Tue Mar 4 16:07:34 2008 @@ -1719,9 +1719,12 @@ zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); return; } - catch ( const Exception & excpt_r ) { - ZYPP_CAUGHT( excpt_r ); - ZYPP_RETHROW( excpt_r ); + catch ( const Exception & e ) { + ZYPP_CAUGHT(e); + zypper.out().error(e, + _("Problem occured during or after installation or removal of packages:"), + _("Please see the above error message for a hint.")); + zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); } } } Modified: trunk/zypper/src/zypper-repos.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/zypper/src/zypper-repos.cc?rev=9000&r1=8999&r2=9000&view=diff ============================================================================== --- trunk/zypper/src/zypper-repos.cc (original) +++ trunk/zypper/src/zypper-repos.cc Tue Mar 4 16:07:34 2008 @@ -1513,7 +1513,18 @@ zypper.out().info(_("Reading installed packages...")); MIL << "Going to read RPM database" << endl; - God->target()->load(); + try + { + God->target()->load(); + } + catch ( const Exception & e ) + { + ZYPP_CAUGHT(e); + zypper.out().error(e, + _("Problem occured while reading the installed packages:"), + _("Please see the above error message for a hint.")); + zypper.setExitCode(ZYPPER_EXIT_ERR_ZYPP); + } } // --------------------------------------------------------------------------- -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org