added special exception class for aborting installation (#154936)

diff --git a/zypp/target/Makefile.am b/zypp/target/Makefile.am
index e5fcc2c4f077f532d64e418d1f4176d236c72d6d..e0ac194cfbbd70877b37e8457c28812b1556e733 100644 (file)
--- a/zypp/target/Makefile.am
+++ b/zypp/target/Makefile.am
@@ -11,7 +11,8 @@ targetincludedir = $(pkgincludedir)/target
 
 targetinclude_HEADERS =                        \
        TargetImpl.h                    \
 
 targetinclude_HEADERS =                        \
        TargetImpl.h                    \

-       TargetCallbackReceiver.h
+       TargetCallbackReceiver.h        \
+       TargetException.h

 
 ## ##################################################
 
 
 ## ##################################################
 


@@ -21,7 +22,8 @@ noinst_LTLIBRARIES =  lib@PACKAGE@_target.la
 
 lib@PACKAGE@_target_la_SOURCES =       \
        TargetImpl.cc                   \
 
 lib@PACKAGE@_target_la_SOURCES =       \
        TargetImpl.cc                   \

-       TargetCallbackReceiver.cc
+       TargetCallbackReceiver.cc       \
+       TargetException.cc

 
 lib@PACKAGE@_target_la_LDFLAGS = @LIBZYPP_VERSION_INFO@
 
 
 lib@PACKAGE@_target_la_LDFLAGS = @LIBZYPP_VERSION_INFO@
 

diff --git a/zypp/target/TargetException.cc b/zypp/target/TargetException.cc
new file mode 100644 (file)
index 0000000..341da74
--- /dev/null
+++ b/zypp/target/TargetException.cc
@@ -0,0 +1,35 @@
+/*---------------------------------------------------------------------\
+|                          ____ _   __ __ ___                          |
+|                         |__  / \ / / . \ . \                         |
+|                           / / \ V /|  _/  _/                         |
+|                          / /__ | | | | | |                           |
+|                         /_____||_| |_| |_|                           |
+|                                                                      |
+\---------------------------------------------------------------------*/
+/** \file zypp/target/TargetException.cc
+ *
+*/
+
+#include <string>
+#include <iostream>
+
+#include "zypp/target/TargetException.h"
+
+using namespace std;
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+  namespace target {
+  /////////////////////////////////////////////////////////////////
+
+    std::ostream & TargetAbortedException::dumpOn( std::ostream & str ) const
+    {
+      return str << "Installation aborted by user" << endl;
+    }
+
+
+  /////////////////////////////////////////////////////////////////
+  } // namespace target
+} // namespace zypp
+///////////////////////////////////////////////////////////////////

diff --git a/zypp/target/TargetException.h b/zypp/target/TargetException.h
new file mode 100644 (file)
index 0000000..39ec002
--- /dev/null
+++ b/zypp/target/TargetException.h
@@ -0,0 +1,72 @@
+/*---------------------------------------------------------------------\
+|                          ____ _   __ __ ___                          |
+|                         |__  / \ / / . \ . \                         |
+|                           / / \ V /|  _/  _/                         |
+|                          / /__ | | | | | |                           |
+|                         /_____||_| |_| |_|                           |
+|                                                                      |
+\---------------------------------------------------------------------*/
+/** \file zypp/target/TargetException.h
+ *
+*/
+#ifndef ZYPP_TARGET_TARGETEXCEPTION_H
+#define ZYPP_TARGET_TARGETEXCEPTION_H
+
+#include <iosfwd>
+
+#include <string>
+
+#include "zypp/base/Exception.h"
+#include "zypp/Pathname.h"
+
+///////////////////////////////////////////////////////////////////
+namespace zypp
+{ /////////////////////////////////////////////////////////////////
+  namespace target {
+    ///////////////////////////////////////////////////////////////
+    //
+    // CLASS NAME : TargetException
+    /** Just inherits Exception to separate target exceptions
+     *
+     **/
+    class TargetException : public Exception
+    {
+    public:
+      /** Ctor taking message.
+       * Use \ref ZYPP_THROW to throw exceptions.
+      */
+      TargetException()
+      : Exception( "Target Exception" )
+      {}
+      /** Ctor taking message.
+       * Use \ref ZYPP_THROW to throw exceptions.
+      */
+      TargetException( const std::string & msg_r )
+      : Exception( msg_r )
+      {}
+      /** Dtor. */
+      virtual ~TargetException() throw() {};
+    };
+
+    class TargetAbortedException : public TargetException
+    {
+    public:
+      /** Ctor taking message.
+       * Use \ref ZYPP_THROW to throw exceptions.
+      */
+      TargetAbortedException( const std::string & msg_r )
+      : TargetException( msg_r )
+      {}
+      /** Dtor. */
+      virtual ~TargetAbortedException() throw() {};
+    protected:
+      virtual std::ostream & dumpOn( std::ostream & str ) const;
+    private:
+    };
+
+
+  /////////////////////////////////////////////////////////////////
+  } // namespace target
+} // namespace zypp
+///////////////////////////////////////////////////////////////////
+#endif // ZYPP_TARGET_TARGETEXCEPTION_H

diff --git a/zypp/target/TargetImpl.cc b/zypp/target/TargetImpl.cc
index 95aa127bc93034673925f82f6278f71c9b46c55c..404c37eda191667b81481d7b216e60c997980584 100644 (file)
--- a/zypp/target/TargetImpl.cc
+++ b/zypp/target/TargetImpl.cc
@@ -370,7 +370,7 @@ namespace zypp
       }
 
       if( abort ) 
       }
 
       if( abort ) 

-        ZYPP_THROW( Exception( N_("Target commit aborted by user.") ) );
+        ZYPP_THROW( TargetAbortedException( N_("Target commit aborted by user.") ) );

 
       return remaining;
     }
 
       return remaining;
     }

diff --git a/zypp/target/TargetImpl.h b/zypp/target/TargetImpl.h
index 86f4b11198ee6c799326ba1580f3e341861be579..48b94268fec61b4296dfdcf0719ce2e5aaf717f4 100644 (file)
--- a/zypp/target/TargetImpl.h
+++ b/zypp/target/TargetImpl.h
@@ -27,6 +27,7 @@
 #include "zypp/Target.h"
 #include "zypp/target/rpm/RpmDb.h"
 #include "zypp/target/store/PersistentStorage.h"
 #include "zypp/Target.h"
 #include "zypp/target/rpm/RpmDb.h"
 #include "zypp/target/store/PersistentStorage.h"

+#include "zypp/target/TargetException.h"

 
 ///////////////////////////////////////////////////////////////////
 namespace zypp
 
 ///////////////////////////////////////////////////////////////////
 namespace zypp