Author: mlandres Date: Tue May 22 15:05:51 2007 New Revision: 5585 URL: http://svn.opensuse.org/viewcvs/zypp?rev=5585&view=rev Log: Dont ask to "retry downloading" on errors that may occurr on any media. Ask whether to retry. Modified: trunk/libzypp/zypp/source/PackageProvider.cc trunk/libzypp/zypp/source/SourceImpl.cc Modified: trunk/libzypp/zypp/source/PackageProvider.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/PackageProvider.cc?rev=5585&r1=5584&r2=5585&view=diff ============================================================================== --- trunk/libzypp/zypp/source/PackageProvider.cc (original) +++ trunk/libzypp/zypp/source/PackageProvider.cc Tue May 22 15:05:51 2007 @@ -278,7 +278,7 @@ std::string package_str = _package->name() + "-" + _package->edition().asString(); // TranslatorExplanation %s = package being checked for integrity - switch ( report()->problem( _package, source::DownloadResolvableReport::INVALID, str::form(_("Package %s fails integrity check. Do you want to retry downloading it?"), package_str.c_str() ) ) ) + switch ( report()->problem( _package, source::DownloadResolvableReport::INVALID, str::form(_("Package %s fails integrity check. Do you want to retry?"), package_str.c_str() ) ) ) { case source::DownloadResolvableReport::RETRY: _retry = true; Modified: trunk/libzypp/zypp/source/SourceImpl.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/source/SourceImpl.cc?rev=5585&r1=5584&r2=5585&view=diff ============================================================================== --- trunk/libzypp/zypp/source/SourceImpl.cc (original) +++ trunk/libzypp/zypp/source/SourceImpl.cc Tue May 22 15:05:51 2007 @@ -334,9 +334,9 @@ if (!digest_ok) { std::string package_str = package->name() + "-" + package->edition().asString(); - + // TranslatorExplanation %s = package - source::DownloadResolvableReport::Action useraction = report->problem(package, source::DownloadResolvableReport::INVALID, str::form(_("Package %s fails integrity check. Do you want to retry downloading it, or abort installation?"), package_str.c_str() )); + source::DownloadResolvableReport::Action useraction = report->problem(package, source::DownloadResolvableReport::INVALID, str::form(_("Package %s fails integrity check. Do you want to retry, or abort installation?"), package_str.c_str() )); if ( useraction == source::DownloadResolvableReport::ABORT ) { @@ -590,7 +590,7 @@ ZYPP_CAUGHT(excpt_r); ERR << "Failed to release all sources" << endl; } - + try { media_mgr.release (_media, true); // one more release needed for eject -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org