- Add Exception::asUserHistory: Returns a single (multiline) string composed

  of asUserString  and  historyAsString. And use it in reports.

diff --git a/zypp/base/Exception.cc b/zypp/base/Exception.cc
index 9e446ad4fdb840fc8e78b04a9a4c36695df48b97..dfd62e39f9405895598654dbe21170e4bf27f20c 100644 (file)
--- a/zypp/base/Exception.cc
+++ b/zypp/base/Exception.cc
@@ -68,6 +68,20 @@ namespace zypp
     return _(str.str().c_str());
   }
 
+  std::string Exception::asUserHistory() const
+  {
+    if ( historyEmpty() )
+      return asUserString();
+
+    std::string ret( asUserString() );
+    if ( ret.empty() )
+      return historyAsString();
+
+    ret += '\n';
+    ret += historyAsString();
+    return ret;
+  }
+
   void Exception::remember( const Exception & old_r )
   {
     if ( &old_r != this ) // no self-remember

diff --git a/zypp/base/Exception.h b/zypp/base/Exception.h
index 325c14e36e9e3214e70a60470d746a5f392eb662..71eb72afd64f1cdaf97c80db816f9d95e77ef68b 100644 (file)
--- a/zypp/base/Exception.h
+++ b/zypp/base/Exception.h
@@ -181,7 +181,9 @@ namespace zypp
     /** Error message provided by \ref dumpOn as string. */
     std::string asString() const;
 
-    /** Translated error message as string suitable for the user. */
+    /** Translated error message as string suitable for the user.
+     * \see \ref asUserStringHistory
+    */
     std::string asUserString() const;
 
   public:
@@ -227,6 +229,8 @@ namespace zypp
     */
     std::string historyAsString() const;
 
+    /** A single (multiline) string composed of \ref asUserString  and  \ref historyAsString. */
+    std::string asUserHistory() const;
     //@}
 
   protected:

diff --git a/zypp/media/MediaAria2c.cc b/zypp/media/MediaAria2c.cc
index a2e8d88a9f09ca0b0ae54c2ac147e59ac4ee5630..2eacecf00d16f6ef1af310bad6c6c7564067e80d 100644 (file)
--- a/zypp/media/MediaAria2c.cc
+++ b/zypp/media/MediaAria2c.cc
@@ -48,9 +48,9 @@
 using namespace std;
 using namespace zypp::base;
 
-namespace zypp 
+namespace zypp
 {
-namespace media 
+namespace media
 {
 
 Pathname MediaAria2c::_cookieFile = "/var/lib/YaST2/cookies";
@@ -70,7 +70,7 @@ MediaAria2c::existsAria2cmd()
     };
 
     ExternalProgram aria(argv, ExternalProgram::Stderr_To_Stdout);
-          
+
     std::string ariaResponse( aria.receiveLine());
     string::size_type pos = ariaResponse.find('/', 0 );
     if( pos != string::npos )
@@ -138,7 +138,7 @@ MediaAria2c::MediaAria2c( const Url &      url_r,
                     true ) // does_download
 {
   MIL << "MediaAria2c::MediaAria2c(" << url_r << ", " << attach_point_hint_r << ")" << endl;
-      
+
   if( !attachPoint().empty())
   {
     PathInfo ainfo(attachPoint());
@@ -169,7 +169,7 @@ MediaAria2c::MediaAria2c( const Url &      url_r,
 void MediaAria2c::attachTo (bool next)
 {
    // clear last arguments
-   _args.clear();   
+   _args.clear();
 
   if ( next )
     ZYPP_THROW(MediaNotSupportedException(_url));
@@ -187,7 +187,7 @@ void MediaAria2c::attachTo (bool next)
     setAttachPoint( mountpoint, true);
   }
 
-  disconnectFrom(); 
+  disconnectFrom();
 
   // Build the aria command.
   _args.push_back(_aria2cPath.asString());
@@ -195,12 +195,12 @@ void MediaAria2c::attachTo (bool next)
   _args.push_back("--summary-interval=1");
   _args.push_back("--follow-metalink=mem");
   _args.push_back( "--check-integrity=true");
-  
+
    // add the anonymous id.
    _args.push_back(str::form("--header=%s", anonymousIdHeader() ));
    _args.push_back(str::form("--header=%s", distributionFlavorHeader() ));
   // TODO add debug option
-   
+
   // Transfer timeout
   {
     _xfer_timeout = TRANSFER_TIMEOUT;
@@ -231,11 +231,11 @@ void MediaAria2c::attachTo (bool next)
       DBG << "Anonymous FTP identification: '" << id << "'" << endl;
       _userpwd = "anonymous:" + id;
     }
-  } 
-  else 
+  }
+  else
   {
      if ( _url.getScheme() == "ftp" )
-     { 
+     {
          _args.push_back(str::form("--ftp-user=%s", _url.getUsername().c_str() ));
      }
      else if ( _url.getScheme() == "http" ||
@@ -243,11 +243,11 @@ void MediaAria2c::attachTo (bool next)
     {
         _args.push_back(str::form("--http-user=%s", _url.getUsername().c_str() ));
     }
-     
+
     if ( _url.getPassword().size() )
     {
       if ( _url.getScheme() == "ftp" )
-      { 
+      {
           _args.push_back(str::form("--ftp-passwd=%s", _url.getPassword().c_str() ));
       }
       else if ( _url.getScheme() == "http" ||
@@ -260,7 +260,7 @@ void MediaAria2c::attachTo (bool next)
 
   // note, aria2c does not support setting the auth type with
   // (basic, digest yet)
-  
+
 
   /*---------------------------------------------------------------*
    CURLOPT_PROXY: host[:port]
@@ -343,7 +343,7 @@ void MediaAria2c::attachTo (bool next)
 
     if ( ! _proxyuserpwd.empty() ) {
         _args.push_back(str::form("--http-proxy-user=%s", _proxyuserpwd.c_str() ));
-      
+
       string proxypassword( _url.getQueryParam( "proxypassword" ) );
       if ( ! proxypassword.empty() ) {
           _args.push_back(str::form("--http-proxy-passwd=%s", proxypassword.c_str() ));
@@ -358,7 +358,7 @@ void MediaAria2c::attachTo (bool next)
   // FIXME: need a derived class to propelly compare url's
   MediaSourceRef media( new MediaSource(_url.getScheme(), _url.asString()));
   setMediaSource(media);
-       
+
 }
 
 bool
@@ -407,7 +407,7 @@ static Url getFileUrl(const Url & url, const Pathname & filename)
 void MediaAria2c::getFile( const Pathname & filename ) const
 {
     // Use absolute file name to prevent access of files outside of the
-    // hierarchy below the attach point.    
+    // hierarchy below the attach point.
     getFileCopy(filename, localPath(filename).absolutename());
 }
 
@@ -415,28 +415,28 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ
 {
   callback::SendReport<DownloadProgressReport> report;
 
-  Url fileurl(getFileUrl(_url, filename));  
+  Url fileurl(getFileUrl(_url, filename));
 
   bool retry = false;
 
   ExternalProgram::Arguments args = _args;
   args.push_back(str::form("--dir=%s", target.dirname().c_str()));
   args.push_back(fileurl.asString());
-  
+
   do
   {
     try
-    {  
-      report->start(_url, target.asString() ); 
-        
-      ExternalProgram aria(args, ExternalProgram::Stderr_To_Stdout);      
-      int nLine = 0;   
+    {
+      report->start(_url, target.asString() );
+
+      ExternalProgram aria(args, ExternalProgram::Stderr_To_Stdout);
+      int nLine = 0;
 
       //Process response
       for(std::string ariaResponse( aria.receiveLine());
-          ariaResponse.length(); 
+          ariaResponse.length();
           ariaResponse = aria.receiveLine())
-      { 
+      {
         //cout << ariaResponse;
 
         if (!ariaResponse.substr(0,31).compare("Exception: Authorization failed") )
@@ -448,11 +448,11 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ
         if (!ariaResponse.substr(0,29).compare("Exception: Resource not found") )
         {
             ZYPP_THROW(MediaFileNotFoundException(_url, filename));
-        }        
+        }
 
         if (!ariaResponse.substr(0,9).compare("[#2 SIZE:")) {
-                
-          if (!nLine) 
+
+          if (!nLine)
           {
             size_t left_bound = ariaResponse.find('(',0) + 1;
             size_t count = ariaResponse.find('%',left_bound) - left_bound;
@@ -460,19 +460,19 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ
             //progressData.toMax();
             report->progress ( std::atoi(ariaResponse.substr(left_bound, count).c_str()), _url, -1, -1 );
             nLine = 1;
-          } 
+          }
           else
           {
             nLine = 0;
-          }                 
-        } 
+          }
+        }
       }
       aria.close();
-        
+
       report->finish( _url ,  zypp::media::DownloadProgressReport::NO_ERROR, "");
       retry = false;
     }
- 
+
     // retry with proper authentication data
     catch (MediaUnauthorizedException & ex_r)
     {
@@ -480,7 +480,7 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ
         retry = true;
       else
       {
-        report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserString());
+        report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserHistory());
         ZYPP_RETHROW(ex_r);
       }
 
@@ -489,7 +489,7 @@ void MediaAria2c::getFileCopy( const Pathname & filename , const Pathname & targ
     catch (MediaException & excpt_r)
     {
       // FIXME: error number fix
-      report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserString());
+      report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserHistory());
       ZYPP_RETHROW(excpt_r);
     }
   }
@@ -530,7 +530,7 @@ bool MediaAria2c::getDoesFileExist( const Pathname & filename ) const
 
 bool MediaAria2c::doGetDoesFileExist( const Pathname & filename ) const
 {
-       
+
   DBG << filename.asString() << endl;
   return true;
 }
@@ -584,7 +584,7 @@ void MediaAria2c::getDirInfo( filesystem::DirContent & retlist,
   getDirectoryYast( retlist, dirname, dots );
 }
 
-std::string MediaAria2c::getAria2cVersion() 
+std::string MediaAria2c::getAria2cVersion()
 {
     const char* argv[] =
     {
@@ -605,7 +605,7 @@ std::string MediaAria2c::getAria2cVersion()
 Pathname MediaAria2c::whereisAria2c()
 {
     Pathname aria2cPathr(ARIA_DEFAULT_BINARY);
-    
+
     const char* argv[] =
     {
       "whereis",
@@ -615,23 +615,23 @@ Pathname MediaAria2c::whereisAria2c()
     };
 
     ExternalProgram aria(argv, ExternalProgram::Stderr_To_Stdout);
-          
+
     std::string ariaResponse( aria.receiveLine());
     aria.close();
-    
+
     string::size_type pos = ariaResponse.find('/', 0 );
-    if( pos != string::npos ) 
+    if( pos != string::npos )
     {
         aria2cPathr = ariaResponse;
         string::size_type pose = ariaResponse.find(' ', pos + 1 );
         aria2cPathr = ariaResponse.substr( pos , pose - pos );
         MIL << "We will use aria2c located here:  " << ariaResponse.substr( pos , pose - pos) << endl;
     }
-    else 
+    else
     {
         MIL << "We don't know were is ari2ac binary. We will use aria2c located here:  " << aria2cPathr << endl;
     }
-    
+
     return aria2cPathr;
 }
 

diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc
index d39b9e37429305ee0a80cafb60fd53ba43180946..6153de3d3e0791f58e11f195ddcf1812179dcc83 100644 (file)
--- a/zypp/media/MediaCurl.cc
+++ b/zypp/media/MediaCurl.cc
@@ -846,7 +846,7 @@ void MediaCurl::getFileCopy( const Pathname & filename , const Pathname & target
         retry = true;
       else
       {
-        report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserString());
+        report->finish(fileurl, zypp::media::DownloadProgressReport::ACCESS_DENIED, ex_r.asUserHistory());
         ZYPP_RETHROW(ex_r);
       }
     }
@@ -854,7 +854,7 @@ void MediaCurl::getFileCopy( const Pathname & filename , const Pathname & target
     catch (MediaException & excpt_r)
     {
       // FIXME: error number fix
-      report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserString());
+      report->finish(fileurl, zypp::media::DownloadProgressReport::ERROR, excpt_r.asUserHistory());
       ZYPP_RETHROW(excpt_r);
     }
   }

diff --git a/zypp/repo/PackageProvider.cc b/zypp/repo/PackageProvider.cc
index 5172e199caefbb795386aa242122cf0cccd4b757..c5b17a9f799b4d81db9848df7c900ce4af0673f4 100644 (file)
--- a/zypp/repo/PackageProvider.cc
+++ b/zypp/repo/PackageProvider.cc
@@ -122,7 +122,7 @@ namespace zypp
 
                 // TranslatorExplanation %s = name of the package being processed.
                 std::string detail_str( str::form(_("Failed to provide Package %s. Do you want to retry retrieval?"), package_str.c_str() ) );
-                detail_str += str::form( "\n\n%s\n%s", excpt.asUserString().c_str(), excpt.historyAsString().c_str() );
+                detail_str += str::form( "\n\n%s", excpt.asUserHistory().c_str() );
 
                 switch ( report()->problem( _package, repo::DownloadResolvableReport::IO, detail_str.c_str() ) )
                 {
@@ -214,7 +214,7 @@ namespace zypp
         }
       catch ( const Exception & excpt )
         {
-          report()->problemDeltaDownload( excpt.asUserString() );
+          report()->problemDeltaDownload( excpt.asUserHistory() );
           return ManagedFile();
         }
       report()->finishDeltaDownload();

diff --git a/zypp/target/TargetCallbackReceiver.cc b/zypp/target/TargetCallbackReceiver.cc
index 55adfa8a67d4f17b3ee102aa4f54c56f43c8f36b..3816f84f66663e4dd71adf2d5fca0e6672bf5671 100644 (file)
--- a/zypp/target/TargetCallbackReceiver.cc
+++ b/zypp/target/TargetCallbackReceiver.cc
@@ -32,17 +32,17 @@ namespace zypp
        RpmInstallPackageReceiver::~RpmInstallPackageReceiver ()
        {
        }
-       
-       void RpmInstallPackageReceiver::reportbegin() 
+
+       void RpmInstallPackageReceiver::reportbegin()
        {
        }
-       
-       void RpmInstallPackageReceiver::reportend() 
+
+       void RpmInstallPackageReceiver::reportend()
        {
        }
 
         /** Start the operation */
-        void RpmInstallPackageReceiver::start( const Pathname & name ) 
+        void RpmInstallPackageReceiver::start( const Pathname & name )
        {
            _report->start( _resolvable );
            _abort = false;
@@ -57,26 +57,26 @@ namespace zypp
            _abort = ! _report->progress( percent, _resolvable );
            return _abort;
        }
-       
-       rpm::RpmInstallReport::Action 
+
+       rpm::RpmInstallReport::Action
        RpmInstallPackageReceiver::problem( Exception & excpt_r )
        {
-           rpm::InstallResolvableReport::Action user = 
+           rpm::InstallResolvableReport::Action user =
                _report->problem( _resolvable
                    , rpm::InstallResolvableReport::INVALID
-                   , excpt_r.asUserString()
+                   , excpt_r.asUserHistory()
                    , _level
                );
-               
+
            switch (user) {
-               case rpm::InstallResolvableReport::RETRY: 
+               case rpm::InstallResolvableReport::RETRY:
                    return rpm::RpmInstallReport::RETRY;
-               case rpm::InstallResolvableReport::ABORT: 
+               case rpm::InstallResolvableReport::ABORT:
                    return rpm::RpmInstallReport::ABORT;
-               case rpm::InstallResolvableReport::IGNORE: 
+               case rpm::InstallResolvableReport::IGNORE:
                    return rpm::RpmInstallReport::IGNORE;
            }
-           
+
            return rpm::RpmInstallReport::problem( excpt_r );
        }
 
@@ -91,7 +91,7 @@ namespace zypp
        {
            _report->finish( _resolvable, rpm::InstallResolvableReport::INVALID, std::string(), _level );
        }
-       
+
        void RpmInstallPackageReceiver::tryLevel( target::rpm::InstallResolvableReport::RpmLevel level_r )
        {
            _level = level_r;
@@ -112,17 +112,17 @@ namespace zypp
        RpmRemovePackageReceiver::~RpmRemovePackageReceiver ()
        {
        }
-       
-       void RpmRemovePackageReceiver::reportbegin() 
+
+       void RpmRemovePackageReceiver::reportbegin()
        {
        }
-       
-       void RpmRemovePackageReceiver::reportend() 
+
+       void RpmRemovePackageReceiver::reportend()
        {
        }
 
         /** Start the operation */
-        void RpmRemovePackageReceiver::start( const std::string & name ) 
+        void RpmRemovePackageReceiver::start( const std::string & name )
        {
            _report->start( _resolvable );
        }
@@ -136,25 +136,25 @@ namespace zypp
            _abort = ! _report->progress( percent, _resolvable );
            return _abort;
        }
-       
-       rpm::RpmRemoveReport::Action 
+
+       rpm::RpmRemoveReport::Action
        RpmRemovePackageReceiver::problem( Exception & excpt_r )
        {
-           rpm::RemoveResolvableReport::Action user = 
+           rpm::RemoveResolvableReport::Action user =
                _report->problem( _resolvable
                    , rpm::RemoveResolvableReport::INVALID
-                   , excpt_r.asUserString()
+                   , excpt_r.asUserHistory()
                );
-               
+
            switch (user) {
-               case rpm::RemoveResolvableReport::RETRY: 
+               case rpm::RemoveResolvableReport::RETRY:
                    return rpm::RpmRemoveReport::RETRY;
-               case rpm::RemoveResolvableReport::ABORT: 
+               case rpm::RemoveResolvableReport::ABORT:
                    return rpm::RpmRemoveReport::ABORT;
-               case rpm::RemoveResolvableReport::IGNORE: 
+               case rpm::RemoveResolvableReport::IGNORE:
                    return rpm::RpmRemoveReport::IGNORE;
            }
-           
+
            return rpm::RpmRemoveReport::problem( excpt_r );
        }
 

diff --git a/zypp/target/rpm/RpmDb.cc b/zypp/target/rpm/RpmDb.cc
index a44aaad4abf6c0b2fbaa96f842c4c974db516d14..4af210a2d22ccdc99e4237dd7286c71acf0fd856 100644 (file)
--- a/zypp/target/rpm/RpmDb.cc
+++ b/zypp/target/rpm/RpmDb.cc
@@ -828,7 +828,7 @@ void RpmDb::rebuildDatabase()
   }
   catch (RpmException & excpt_r)
   {
-    report->finish(root() + dbPath(), RebuildDBReport::FAILED, excpt_r.asUserString());
+    report->finish(root() + dbPath(), RebuildDBReport::FAILED, excpt_r.asUserHistory());
     ZYPP_RETHROW(excpt_r);
   }
   report->finish(root() + dbPath(), RebuildDBReport::NO_ERROR, "");
@@ -1238,7 +1238,7 @@ const list<Package::Ptr> & RpmDb::getPackages()
   }
   catch (RpmException & excpt_r)
   {
-    report->finish(ScanDBReport::FAILED, excpt_r.asUserString ());
+    report->finish(ScanDBReport::FAILED, excpt_r.asUserHistory ());
     ZYPP_RETHROW(excpt_r);
   }
 #warning fixme