Dont ask to "retry downloading" on errors that may occurr on any media. Ask whether...

diff --git a/zypp/source/PackageProvider.cc b/zypp/source/PackageProvider.cc
index 1e5dda2..23e9793 100644 (file)
--- a/zypp/source/PackageProvider.cc
+++ b/zypp/source/PackageProvider.cc
@@ -278,7 +278,7 @@ namespace zypp
       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;

diff --git a/zypp/source/SourceImpl.cc b/zypp/source/SourceImpl.cc
index e906137..3a24538 100644 (file)
--- a/zypp/source/SourceImpl.cc
+++ b/zypp/source/SourceImpl.cc
@@ -334,9 +334,9 @@ const Pathname SourceImpl::providePackage( Package::constPtr package )
     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 @@ const Pathname SourceImpl::provideJustFile(const Pathname & file_r,
             ZYPP_CAUGHT(excpt_r);
             ERR << "Failed to release all sources" << endl;
           }
-          
+
           try
           {
             media_mgr.release (_media, true); // one more release needed for eject