adapt to changed ZYPP_THROW macros

diff --git a/zypp/CapFactory.cc b/zypp/CapFactory.cc
index ea371ffa1683655a500d378f25d18c4bb1227794..d1aee758fbf75a5ed6b34186e4b6368e37581d2c 100644 (file)
--- a/zypp/CapFactory.cc
+++ b/zypp/CapFactory.cc
@@ -131,7 +131,7 @@ namespace zypp
     static void assertResKind( const Resolvable::Kind & refers_r )
     {
       if ( refers_r == Resolvable::Kind() )
-        ZYPP_THROW( Exception, "Missing or empty  Resolvable::Kind in Capability." );
+        ZYPP_THROW( Exception("Missing or empty  Resolvable::Kind in Capability") );
     }
 
     /** Check whether \a op_r and \a edition_r make a valid edition spec.
@@ -155,7 +155,7 @@ namespace zypp
           break;
 
         case Rel::NONE_e:
-          ZYPP_THROW( Exception, "Operator NONE is not allowed in Capability " );
+          ZYPP_THROW( Exception("Operator NONE is not allowed in Capability") );
           break;
 
         case Rel::EQ_e:
@@ -168,7 +168,7 @@ namespace zypp
           break;
         }
       // SHOULD NOT GET HERE
-      ZYPP_THROW( Exception, "Unknow Operator NONE is not allowed in Capability " );
+      ZYPP_THROW( Exception("Unknow Operator NONE is not allowed in Capability") );
       return false; // not reached
     }
 

diff --git a/zypp/Edition.cc b/zypp/Edition.cc
index 22a871021f8883377b692a0ce69766722133818b..90741e7e87951484e78d0bbda617eb18c064293d 100644 (file)
--- a/zypp/Edition.cc
+++ b/zypp/Edition.cc
@@ -162,7 +162,7 @@ namespace zypp
         }
       else
         {
-          ZYPP_THROW( Exception, string("Invalid Edition: ")+edition_r );
+          ZYPP_THROW( Exception(string("Invalid Edition: ")+edition_r) );
         }
     }
 
@@ -195,7 +195,7 @@ namespace zypp
       char * endptr = NULL;
       epoch_t ret = strtoul( epoch_r.c_str(), &endptr, 10 );
       if ( *endptr != '\0' )
-        ZYPP_THROW( Exception, string("Invalid eopch: ")+epoch_r );
+        ZYPP_THROW( Exception(string("Invalid eopch: ")+epoch_r) );
       return ret;
     }
 
@@ -204,7 +204,7 @@ namespace zypp
     {
       str::smatch what;
       if( ! str::regex_match( vr_r.begin(), vr_r.end(), what, _rxVR ) )
-        ZYPP_THROW( Exception, string("Invalid version/release: ")+vr_r );
+        ZYPP_THROW( Exception(string("Invalid version/release: ")+vr_r) );
       return vr_r;
     }
 

diff --git a/zypp/Rel.cc b/zypp/Rel.cc
index dcea484e3a61c938930239ebd947df088c87dcfd..804c107c6c14039a36a1eca0d2ecfdf1666b2633 100644 (file)
--- a/zypp/Rel.cc
+++ b/zypp/Rel.cc
@@ -45,7 +45,7 @@ namespace
       = _table.find( strval_r );
     if ( it == _table.end() )
       {
-        ZYPP_THROW( Exception, "Rel parse: illegal string value" );
+        ZYPP_THROW( Exception("Rel parse: illegal string value") );
       }
     return it->second;
   }

diff --git a/zypp/base/Exception.cc b/zypp/base/Exception.cc
index d98d266f274f354725228a4fcb9482f104124437..e172100fb0b979460d370d4dfce543510adb9b6a 100644 (file)
--- a/zypp/base/Exception.cc
+++ b/zypp/base/Exception.cc
@@ -58,22 +58,17 @@ namespace zypp
   }
 
   std::ostream & Exception::dumpOn( std::ostream & str ) const
-  {
-    return str << _msg;
-  }
+  { return str << _msg; }
 
   std::ostream & Exception::dumpError( std::ostream & str ) const
-  {
-    return dumpOn( str << _where << ": " );
-  }
+  { return dumpOn( str << _where << ": " ); }
 
   std::ostream & operator<<( std::ostream & str, const Exception & obj )
   { return obj.dumpError( str ); }
 
+
   std::string Exception::strErrno( int errno_r )
-  {
-    return str::strerror( errno_r );
-  }
+  { return str::strerror( errno_r ); }
 
   std::string Exception::strErrno( int errno_r, const std::string & msg_r )
   {

diff --git a/zypp/base/Exception.h b/zypp/base/Exception.h
index 9666f6f5931dbe5d6a54e55ccf783fadeffb2eb4..e4c822ceb4d71ea26b6c4a90bbb6cceb1498a606 100644 (file)
--- a/zypp/base/Exception.h
+++ b/zypp/base/Exception.h
@@ -65,15 +65,26 @@ namespace zypp
   ///////////////////////////////////////////////////////////////////
   //
   //   CLASS NAME : Exception
-  /** Exception stores message and \ref CodeLocation.
+  /** Base class for Exception.
    *
-   * Use \ref ZYPP_THROW to throw exceptions.
+   * Exception offers to store a message string passed to the ctor.
+   * Derived classes may provide additional information. Overload
+   * \ref dumpOn to provide a proper error text.
+   *
+   * \li Use \ref ZYPP_THROW to throw exceptions.
+   * \li Use \ref ZYPP_CAUGHT If you caught an exceptions in order to handle it.
+   * \li Use \ref ZYPP_RETHROW to rethrow a caught exception.
+   *
+   * The use of these macros is not mandatory. but \c ZYPP_THROW and
+   * \c ZYPP_RETHROW will adjust the code location information stored in
+   * the Exception. All three macros will drop a line in the logfile.
+
    * \code
    *  43   try
    *  44     {
    *  45       try
    *  46         {
-   *  47           ZYPP_THROW_MSG( Exception, "Something bad happened." );
+   *  47           ZYPP_THROW( Exception("Something bad happened.") );
    *  48         }
    *  49       catch ( Exception & excpt )
    *  50         {
@@ -128,18 +139,20 @@ namespace zypp
     void relocate( const CodeLocation & where_r ) const
     { _where = where_r; }
 
-    /** Return the message string provided to the ctor. */
+    /** Return the message string provided to the ctor.
+     * \note This is not neccessarily the complete error message.
+     * The whole error message is provided by \ref asString or
+     * \ref dumpOn.
+    */
     const std::string & msg() const
     { return _msg; }
 
-    /** A proper error message. */
+    /** Error message provided by \ref dumpOn as string. */
     std::string asString() const;
 
   protected:
 
-    /** Overload this to print a proper error message.
-     * CodeLocation is prepended automatically.
-    */
+    /** Overload this to print a proper error message. */
     virtual std::ostream & dumpOn( std::ostream & str ) const;
 
   public:
@@ -163,7 +176,10 @@ namespace zypp
     virtual const char * what() const throw()
     { return _msg.c_str(); }
 
-    /** Called by <tt>std::ostream & operator\<\<</tt> */
+    /** Called by <tt>std::ostream & operator\<\<</tt>.
+     * Prints \ref CodeLocation and the error message provided by
+     * \ref dumpOn.
+    */
     std::ostream & dumpError( std::ostream & str ) const;
   };
   ///////////////////////////////////////////////////////////////////
@@ -206,7 +222,7 @@ namespace zypp
   */
   //@{
   /** Drops a logline and throws the Exception. */
-#define ZYPP_DOTHROW(EXCPT)\
+#define ZYPP_THROW(EXCPT)\
   _ZYPP_THROW( EXCPT, ZYPP_EX_CODELOCATION )
 
   /** Drops a logline telling the Exception was caught (in order to handle it). */
@@ -218,29 +234,25 @@ namespace zypp
   _ZYPP_RETHROW( EXCPT, ZYPP_EX_CODELOCATION )
 
 
-  /** Throw Exception built from a message string. */
-#define ZYPP_THROW(EXCPTTYPE, MSG)\
-  ZYPP_DOTHROW( EXCPTTYPE( MSG ) )
-
   /** Throw Exception built from a message string. */
 #define ZYPP_THROW_MSG(EXCPTTYPE, MSG)\
-  ZYPP_DOTHROW( EXCPTTYPE( MSG ) )
+  ZYPP_THROW( EXCPTTYPE( MSG ) )
 
   /** Throw Exception built from errno. */
 #define ZYPP_THROW_ERRNO(EXCPTTYPE)\
-  ZYPP_DOTHROW( EXCPTTYPE( ::zypp::Exception::strErrno(errno) ) )
+  ZYPP_THROW( EXCPTTYPE( ::zypp::Exception::strErrno(errno) ) )
 
   /** Throw Exception built from errno provided as argument. */
 #define ZYPP_THROW_ERRNO1(EXCPTTYPE, ERRNO)\
-  ZYPP_DOTHROW( EXCPTTYPE( ::zypp::Exception::strErrno(ERRNO) ) )
+  ZYPP_THROW( EXCPTTYPE( ::zypp::Exception::strErrno(ERRNO) ) )
 
   /** Throw Exception built from errno and a message string. */
 #define ZYPP_THROW_ERRNO_MSG(EXCPTTYPE, MSG)\
-  ZYPP_DOTHROW( EXCPTTYPE( ::zypp::Exception::strErrno(errno,MSG) ) )
+  ZYPP_THROW( EXCPTTYPE( ::zypp::Exception::strErrno(errno,MSG) ) )
 
   /** Throw Exception built from errno provided as argument and a message string */
 #define ZYPP_THROW_ERRNO_MSG1(EXCPTTYPE, ERRNO,MSG)\
-  ZYPP_DOTHROW( EXCPTTYPE( ::zypp::Exception::strErrno(ERRNO,MSG) ) )
+  ZYPP_THROW( EXCPTTYPE( ::zypp::Exception::strErrno(ERRNO,MSG) ) )
   //@}
 
   /////////////////////////////////////////////////////////////////

diff --git a/zypp/media/MediaAccess.cc b/zypp/media/MediaAccess.cc
index e9e9e304f966f4d0680e25f139a38d347faee93e..2957c407ce73f6a31127d22ffae40f815d1b9e1e 100644 (file)
--- a/zypp/media/MediaAccess.cc
+++ b/zypp/media/MediaAccess.cc
@@ -62,7 +62,7 @@ void
 MediaAccess::open (const Url& url, const Pathname & preferred_attach_point)
 {
     if(!url.isValid()) {
-        ZYPP_DOTHROW(MediaBadUrlException(url));
+        ZYPP_THROW(MediaBadUrlException(url));
     }
 
     close();
@@ -164,7 +164,7 @@ void MediaAccess::attach (bool next)
 {
   if ( !_handler ) {
     INT << "Error::E_media_not_open" << endl;
-    ZYPP_DOTHROW(MediaNotOpenException());
+    ZYPP_THROW(MediaNotOpenException());
   }
   _handler->attach(next);
 }
@@ -202,7 +202,7 @@ void
 MediaAccess::disconnect()
 {
   if ( !_handler )
-    ZYPP_DOTHROW(MediaNotOpenException());
+    ZYPP_THROW(MediaNotOpenException());
 
   _handler->disconnect();
 }
@@ -232,11 +232,11 @@ MediaAccess::provideFile( const Pathname & filename, bool cached, bool checkonly
   }
 
   if(checkonly)
-    ZYPP_DOTHROW(MediaFileNotFoundException(url(), filename));
+    ZYPP_THROW(MediaFileNotFoundException(url(), filename));
 
   if ( !_handler ) {
     INT << "Error::E_media_not_open" << " on provideFile(" << filename << ")" << endl;
-    ZYPP_DOTHROW(MediaNotOpenException());
+    ZYPP_THROW(MediaNotOpenException());
   }
 
   _handler->provideFile( filename );
@@ -260,7 +260,7 @@ MediaAccess::provideDir( const Pathname & dirname ) const
 {
   if ( !_handler ) {
     INT << "Error::E_media_not_open" << " on provideDir(" << dirname << ")" << endl;
-    ZYPP_DOTHROW(MediaNotOpenException());
+    ZYPP_THROW(MediaNotOpenException());
   }
 
   _handler->provideDir( dirname );
@@ -271,7 +271,7 @@ MediaAccess::provideDirTree( const Pathname & dirname ) const
 {
   if ( !_handler ) {
     INT << "Error::E_media_not_open" << " on provideDirTree(" << dirname << ")" << endl;
-    ZYPP_DOTHROW(MediaNotOpenException());
+    ZYPP_THROW(MediaNotOpenException());
   }
 
   _handler->provideDirTree( dirname );
@@ -303,7 +303,7 @@ MediaAccess::dirInfo( list<string> & retlist, const Pathname & dirname, bool dot
 
   if ( !_handler ) {
     INT << "Error::E_media_not_open" << " on dirInfo(" << dirname << ")" << endl;
-    ZYPP_DOTHROW(MediaNotOpenException());
+    ZYPP_THROW(MediaNotOpenException());
   }
 
   _handler->dirInfo( retlist, dirname, dots );
@@ -317,7 +317,7 @@ MediaAccess::dirInfo( filesystem::DirContent & retlist, const Pathname & dirname
 
   if ( !_handler ) {
     INT << "Error::E_media_not_open" << " on dirInfo(" << dirname << ")" << endl;
-    ZYPP_DOTHROW(MediaNotOpenException());
+    ZYPP_THROW(MediaNotOpenException());
   }
 
   _handler->dirInfo( retlist, dirname, dots );

diff --git a/zypp/media/MediaAccess.h b/zypp/media/MediaAccess.h
index 46b381b447376c6c35a16b7d8869bb61bd5493e6..604ff5c8b66d96bf0460ca31250ef61dd872275e 100644 (file)
--- a/zypp/media/MediaAccess.h
+++ b/zypp/media/MediaAccess.h
@@ -332,7 +332,7 @@ namespace zypp {
            , _local_file( "" )
          {
            if ( _file.empty() ) {
-             ZYPP_DOTHROW(MediaBadFilenameException(_file.asString()));
+             ZYPP_THROW(MediaBadFilenameException(_file.asString()));
            } else if ( _media ) {
              try {
                _media->provideFile( _file );

diff --git a/zypp/media/MediaCurl.cc b/zypp/media/MediaCurl.cc
index 30f6dbd71d0397ab46333a550e1fb6ee3be7341f..ad1ec6f4b25bb30bc49ec620e3c721d5c93f0691 100644 (file)
--- a/zypp/media/MediaCurl.cc
+++ b/zypp/media/MediaCurl.cc
@@ -100,18 +100,18 @@ void MediaCurl::setCookieFile( const Pathname &fileName )
 void MediaCurl::attachTo (bool next)
 {
   if ( next )
-    ZYPP_THROW( MediaException, "Error::E_not_supported_by_media");
+    ZYPP_THROW( MediaException("Error::E_not_supported_by_media") );
 
 #warning FIXME implement check for URL validity
 #if 0
   if ( !_url.isValid() )
-    ZYPP_THROW( MediaException, "Error::E_bad_url");
+    ZYPP_THROW( MediaException("Error::E_bad_url") );
 #endif
 
   _curl = curl_easy_init();
   if ( !_curl ) {
     ERR << "curl easy init failed" << endl;
-    ZYPP_THROW( MediaException, "Error::E_error");
+    ZYPP_THROW( MediaException("Error::E_error") );
   }
 
   _connected = true;
@@ -119,13 +119,13 @@ void MediaCurl::attachTo (bool next)
   CURLcode ret = curl_easy_setopt( _curl, CURLOPT_ERRORBUFFER, _curlError );
   if ( ret != 0 ) {
     ERR << "Error setting error buffer" << endl;
-    ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+    ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
   }
 
   ret = curl_easy_setopt( _curl, CURLOPT_FAILONERROR, true );
   if ( ret != 0 ) {
     ERR << _curlError << endl;
-    ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+    ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
   }
 
   if ( _url.getScheme() == "http" ) {
@@ -134,12 +134,12 @@ void MediaCurl::attachTo (bool next)
     ret = curl_easy_setopt ( _curl, CURLOPT_FOLLOWLOCATION, true );
     if ( ret != 0) {
       ERR << _curlError << endl;
-      ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+      ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
     }
     ret = curl_easy_setopt ( _curl, CURLOPT_MAXREDIRS, 3L );
     if ( ret != 0) {
       ERR << _curlError << endl;
-      ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+      ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
     }
   }
 
@@ -150,13 +150,13 @@ void MediaCurl::attachTo (bool next)
     ret = curl_easy_setopt( _curl, CURLOPT_SSL_VERIFYPEER, 0 );
     if ( ret != 0 ) {
       ERR << _curlError << endl;
-      ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+      ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
     }
 
     ret = curl_easy_setopt( _curl, CURLOPT_SSL_VERIFYHOST, 0 );
     if ( ret != 0 ) {
       ERR << _curlError << endl;
-      ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+      ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
     }
   }
 
@@ -187,7 +187,7 @@ void MediaCurl::attachTo (bool next)
     ret = curl_easy_setopt( _curl, CURLOPT_USERPWD, _userpwd.c_str() );
     if ( ret != 0 ) {
       ERR << _curlError << endl;
-      ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+      ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
     }
   }
 
@@ -251,7 +251,7 @@ void MediaCurl::attachTo (bool next)
     ret = curl_easy_setopt( _curl, CURLOPT_PROXY, _proxy.c_str() );
     if ( ret != 0 ) {
       ERR << _curlError << endl;
-      ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+      ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
     }
 
     /*---------------------------------------------------------------*
@@ -286,7 +286,7 @@ void MediaCurl::attachTo (bool next)
     ret = curl_easy_setopt( _curl, CURLOPT_PROXYUSERPWD, _proxyuserpwd.c_str() );
     if ( ret != 0 ) {
       ERR << _curlError << endl;
-      ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+      ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
     }
 
   }
@@ -300,27 +300,27 @@ void MediaCurl::attachTo (bool next)
                           _currentCookieFile.c_str() );
   if ( ret != 0 ) {
     ERR << _curlError << endl;
-    ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+    ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
   }
 
   ret = curl_easy_setopt( _curl, CURLOPT_COOKIEJAR,
                           _currentCookieFile.c_str() );
   if ( ret != 0 ) {
     ERR << _curlError << endl;
-    ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+    ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
   }
 
   ret = curl_easy_setopt( _curl, CURLOPT_PROGRESSFUNCTION,
                           &MediaCurl::progressCallback );
   if ( ret != 0 ) {
     ERR << _curlError << endl;
-    ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+    ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
   }
 
   ret = curl_easy_setopt( _curl, CURLOPT_NOPROGRESS, false );
   if ( ret != 0 ) {
     ERR << _curlError << endl;
-    ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+    ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
   }
 }
 
@@ -371,11 +371,11 @@ void MediaCurl::getFileCopy( const Pathname & filename , const Pathname & target
 #warning FIXME implement check for URL validity
 #if 0
     if(!_url.isValid())
-      ZYPP_THROW( MediaException, string("Error::E_bad_url") + " " + _url.toString());
+      ZYPP_THROW( MediaException(string("Error::E_bad_url") + " " + _url.toString()) );
 #endif
 
     if(_url.getHost().empty())
-      ZYPP_THROW( MediaException, "Error::E_no_host_specified");
+      ZYPP_THROW( MediaException("Error::E_no_host_specified") );
 
     string path = _url.getPathName();
     if ( !path.empty() && path != "/" && *path.rbegin() == '/' &&
@@ -404,7 +404,7 @@ void MediaCurl::getFileCopy( const Pathname & filename , const Pathname & target
     if( assert_dir( dest.dirname() ) )
     {
       DBG << "assert_dir " << dest.dirname() << " failed" << endl;
-      ZYPP_THROW( MediaException, string("Error::E_system") + string(" ") + dest.dirname().asString());
+      ZYPP_THROW( MediaException(string("Error::E_system") + string(" ") + dest.dirname().asString()) );
     }
 
     DBG << "URL: " << url.toString().c_str() << endl;
@@ -422,20 +422,20 @@ void MediaCurl::getFileCopy( const Pathname & filename , const Pathname & target
                                      urlBuffer.c_str() );
     if ( ret != 0 ) {
       ERR << _curlError << endl;
-      ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+      ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
     }
 
     FILE *file = fopen( destNew.c_str(), "w" );
     if ( !file ) {
       ERR << "fopen failed for file '" << destNew << "'" << endl;
-      ZYPP_THROW( MediaException, string("Error::E_write_error") + string(" ") + destNew);
+      ZYPP_THROW( MediaException(string("Error::E_write_error") + string(" ") + destNew) );
     }
 
     ret = curl_easy_setopt( _curl, CURLOPT_WRITEDATA, file );
     if ( ret != 0 ) {
       fclose( file );
       ERR << _curlError << endl;
-      ZYPP_THROW( MediaException, "Error::E_curl_setopt_failed");
+      ZYPP_THROW( MediaException("Error::E_curl_setopt_failed") );
     }
 
     // Set callback and perform.
@@ -489,7 +489,7 @@ void MediaCurl::getFileCopy( const Pathname & filename , const Pathname & target
 #if 0
              report->stop( err );
 #endif
-             ZYPP_THROW( MediaException, err + string(" ") + _curlError);
+             ZYPP_THROW( MediaException(err + string(" ") + _curlError) );
             }
           }
           break;
@@ -523,7 +523,7 @@ void MediaCurl::getFileCopy( const Pathname & filename , const Pathname & target
 #if 0
       report->stop( err );
 #endif
-      ZYPP_THROW( MediaException, err + string(" ") + _curlError);
+      ZYPP_THROW( MediaException(err + string(" ") + _curlError) );
     }
 
     if ( rename( destNew, dest ) != 0 ) {
@@ -532,7 +532,7 @@ void MediaCurl::getFileCopy( const Pathname & filename , const Pathname & target
 #if 0
       report->stop( Error::E_write_error );
 #endif
-      ZYPP_THROW( MediaException, "Error::E_write_error");
+      ZYPP_THROW( MediaException("Error::E_write_error") );
     }
 
 #warning FIXME reenable change report
@@ -615,7 +615,7 @@ void MediaCurl::getDirInfo( std::list<std::string> & retlist,
   }
   catch (const MediaException & excpt_r)
   {
-    ZYPP_THROW( MediaException, "Error::E_not_supported_by_media");
+    ZYPP_THROW( MediaException("Error::E_not_supported_by_media") );
   }
 }
 
@@ -635,7 +635,7 @@ void MediaCurl::getDirInfo( filesystem::DirContent & retlist,
   }
   catch (const MediaException & excpt_r)
   {
-    ZYPP_THROW( MediaException, "Error::E_not_supported_by_media");
+    ZYPP_THROW( MediaException("Error::E_not_supported_by_media") );
   }
 }
 

diff --git a/zypp/media/MediaException.h b/zypp/media/MediaException.h
index 8c7cd2098f2346233b242d2143b73ae310da9725..798c1bf584fb6043348a96e48ee0f35678fd6df1 100644 (file)
--- a/zypp/media/MediaException.h
+++ b/zypp/media/MediaException.h
@@ -53,7 +53,7 @@ namespace zypp
     {
     public:
       /** Ctor taking message.
-       * Use \ref ZYPP_DOTHROW to throw exceptions.
+       * Use \ref ZYPP_THROW to throw exceptions.
       */
       MediaMountException( const std::string & error_r,
                           const std::string & source_r,
@@ -77,7 +77,7 @@ namespace zypp
     {
     public:
       /** Ctor taking message.
-       * Use \ref ZYPP_DOTHROW to throw exceptions.
+       * Use \ref ZYPP_THROW to throw exceptions.
       */
       MediaUnmountException( const std::string & error_r,
                             const std::string & path_r )
@@ -231,7 +231,7 @@ namespace zypp
       std::string _url;
     };
 
-    
+
 
   /////////////////////////////////////////////////////////////////
   } // namespace media

diff --git a/zypp/media/MediaHandler.cc b/zypp/media/MediaHandler.cc
index b4e8f1bd05bb90c1407251b0f22ca133b07a58a6..87cbd49d0832d8c214fd962fd0199e3b7badae18 100644 (file)
--- a/zypp/media/MediaHandler.cc
+++ b/zypp/media/MediaHandler.cc
@@ -153,7 +153,7 @@ void MediaHandler::attach( bool next )
 
   if ( _attachPoint.empty() ) {
     ERR << "Error::E_bad_attachpoint" << endl;
-    ZYPP_THROW( MediaException, "Error::E_bad_attachpoint");
+    ZYPP_THROW( MediaException("Error::E_bad_attachpoint") );
   }
 
   try {
@@ -256,7 +256,7 @@ void MediaHandler::provideFileCopy( Pathname srcFilename,
   if ( !_isAttached ) {
     INT << "Error::E_not_attached" << " on provideFileCopy(" << srcFilename
         << "," << targetFilename << ")" << endl;
-    ZYPP_DOTHROW(MediaNotAttachedException(url()));
+    ZYPP_THROW(MediaNotAttachedException(url()));
   }
 
   try {
@@ -274,7 +274,7 @@ void MediaHandler::provideFile( Pathname filename ) const
 {
   if ( !_isAttached ) {
     INT << "Error: Not attached on provideFile(" << filename << ")" << endl;
-    ZYPP_DOTHROW(MediaNotAttachedException(url()));
+    ZYPP_THROW(MediaNotAttachedException(url()));
   }
 
   try {
@@ -301,7 +301,7 @@ void MediaHandler::provideDir( Pathname dirname ) const
 {
   if ( !_isAttached ) {
     INT << "Error: Not attached on provideDir(" << dirname << ")" << endl;
-    ZYPP_DOTHROW(MediaNotAttachedException(url()));
+    ZYPP_THROW(MediaNotAttachedException(url()));
   }
   try {
     getDir( dirname, /*recursive*/false ); // pass to concrete handler
@@ -326,7 +326,7 @@ void MediaHandler::provideDirTree( Pathname dirname ) const
 {
   if ( !_isAttached ) {
     INT << "Error Not attached on provideDirTree(" << dirname << ")" << endl;
-    ZYPP_DOTHROW(MediaNotAttachedException(url()));
+    ZYPP_THROW(MediaNotAttachedException(url()));
   }
 
   try {
@@ -382,7 +382,7 @@ void MediaHandler::dirInfo( list<string> & retlist,
 
   if ( !_isAttached ) {
     INT << "Error: Not attached on dirInfo(" << dirname << ")" << endl;
-    ZYPP_DOTHROW(MediaNotAttachedException(url()));
+    ZYPP_THROW(MediaNotAttachedException(url()));
   }
 
   try {
@@ -411,7 +411,7 @@ void MediaHandler::dirInfo( filesystem::DirContent & retlist,
 
   if ( !_isAttached ) {
     INT << "Error: Not attached on dirInfo(" << dirname << ")" << endl;
-    ZYPP_DOTHROW(MediaNotAttachedException(url()));
+    ZYPP_THROW(MediaNotAttachedException(url()));
   }
 
   try {
@@ -478,7 +478,7 @@ void MediaHandler::getDirectoryYast( filesystem::DirContent & retlist,
   ifstream dir( localPath( dirFile ).asString().c_str() );
   if ( dir.fail() ) {
     ERR << "Unable to load '" << localPath( dirFile ) << "'" << endl;
-    ZYPP_DOTHROW(MediaSystemException(url(),
+    ZYPP_THROW(MediaSystemException(url(),
       "Unable to load '" + localPath( dirFile ).asString() + "'"));
   }
 
@@ -535,9 +535,9 @@ void MediaHandler::getFile( const Pathname & filename ) const
     }
 
     if (info.isExist())
-      ZYPP_DOTHROW(MediaNotAFileException(url(), localPath(filename)));
+      ZYPP_THROW(MediaNotAFileException(url(), localPath(filename)));
     else
-      ZYPP_DOTHROW(MediaFileNotFoundException(url(), filename));
+      ZYPP_THROW(MediaFileNotFoundException(url(), filename));
 }
 
 
@@ -552,7 +552,7 @@ void MediaHandler::getFileCopy ( const Pathname & srcFilename, const Pathname &
   }
 
   if ( copy( localPath( srcFilename ), targetFilename ) != 0 ) {
-    ZYPP_DOTHROW(MediaWriteException(targetFilename));
+    ZYPP_THROW(MediaWriteException(targetFilename));
   }
 }
 
@@ -575,9 +575,9 @@ void MediaHandler::getDir( const Pathname & dirname, bool recurse_r ) const
   }
 
   if (info.isExist())
-    ZYPP_DOTHROW(MediaNotADirException(url(), localPath(dirname)));
+    ZYPP_THROW(MediaNotADirException(url(), localPath(dirname)));
   else
-    ZYPP_DOTHROW(MediaFileNotFoundException(url(), dirname));
+    ZYPP_THROW(MediaFileNotFoundException(url(), dirname));
 }
 
 ///////////////////////////////////////////////////////////////////
@@ -594,7 +594,7 @@ void MediaHandler::getDirInfo( std::list<std::string> & retlist,
 {
   PathInfo info( localPath( dirname ) );
   if( ! info.isDir() ) {
-    ZYPP_DOTHROW(MediaNotADirException(url(), localPath(dirname)));
+    ZYPP_THROW(MediaNotADirException(url(), localPath(dirname)));
   }
 
 #if NONREMOTE_DIRECTORY_YAST
@@ -609,7 +609,7 @@ void MediaHandler::getDirInfo( std::list<std::string> & retlist,
   // readdir
     int res = readdir( retlist, info.path(), dots );
   if ( res )
-    ZYPP_DOTHROW(MediaSystemException(url(), "readdir failed"));
+    ZYPP_THROW(MediaSystemException(url(), "readdir failed"));
 
 #if NONREMOTE_DIRECTORY_YAST
   }
@@ -632,7 +632,7 @@ void MediaHandler::getDirInfo( filesystem::DirContent & retlist,
 {
   PathInfo info( localPath( dirname ) );
   if( ! info.isDir() ) {
-    ZYPP_DOTHROW(MediaNotADirException(url(), localPath(dirname)));
+    ZYPP_THROW(MediaNotADirException(url(), localPath(dirname)));
   }
 
 #if NONREMOTE_DIRECTORY_YAST
@@ -647,7 +647,7 @@ void MediaHandler::getDirInfo( filesystem::DirContent & retlist,
   // readdir
   int res = readdir( retlist, info.path(), dots );
   if ( res )
-    ZYPP_DOTHROW(MediaSystemException(url(), "readdir failed"));
+    ZYPP_THROW(MediaSystemException(url(), "readdir failed"));
 #if NONREMOTE_DIRECTORY_YAST
   }
 #endif

diff --git a/zypp/media/Mount.cc b/zypp/media/Mount.cc
index 97c9ba9256c25c6051ef9af5a2597f565f7b8bcb..2d01dea1845d1b3bd84840eb1cf260187df98ac2 100644 (file)
--- a/zypp/media/Mount.cc
+++ b/zypp/media/Mount.cc
@@ -78,7 +78,7 @@ void Mount::mount ( const string& source,
 
     if ( process == NULL )
     {
-      ZYPP_DOTHROW(MediaMountException(source, target, "Error::E_mount_failed"));
+      ZYPP_THROW(MediaMountException(source, target, "Error::E_mount_failed"));
     }
 
     string value;
@@ -132,7 +132,7 @@ void Mount::mount ( const string& source,
 
     if ( err != "" ) {
       WAR << "mount " << source << " " << target << ": " << err << endl;
-      ZYPP_DOTHROW(MediaMountException(source, target, err));
+      ZYPP_THROW(MediaMountException(source, target, err));
     } else {
       MIL << "mounted " << source << " " << target << endl;
     }
@@ -152,7 +152,7 @@ void Mount::umount (const string& path)
 
     if ( process == NULL )
     {
-        ZYPP_DOTHROW(MediaUnmountException("E_mount_failed", path));
+        ZYPP_THROW(MediaUnmountException("E_mount_failed", path));
     }
 
     string value;
@@ -203,7 +203,7 @@ void Mount::umount (const string& path)
 
     if ( err != "") {
       WAR << "umount " << path << ": " << err << endl;
-      ZYPP_DOTHROW(MediaUnmountException(err, path));
+      ZYPP_THROW(MediaUnmountException(err, path));
     } else {
       MIL << "unmounted " << path << endl;
     }

diff --git a/zypp/source/yum/YUMSource.cc b/zypp/source/yum/YUMSource.cc
index 71d572868be37f6348e790bba6b8ff97b263f5c5..9cff01c3cad91f2736e55ac0bf249aee1ac26483 100644 (file)
--- a/zypp/source/yum/YUMSource.cc
+++ b/zypp/source/yum/YUMSource.cc
@@ -88,7 +88,7 @@ namespace zypp
        catch (...)
        {
        ERR << "Cannot read repomd file, cannot initialize source" << endl;
-//     ZYPP_THROW( Exception, "Cannot read repomd file, cannot initialize source" );
+//     ZYPP_THROW( Exception("Cannot read repomd file, cannot initialize source") );
        }
        try {
        // now put other and filelist data to structures for easier find