Author: aschnell Date: Fri Aug 24 10:29:50 2007 New Revision: 6859 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6859&view=rev Log: - added remembering of exception history Modified: trunk/libzypp/zypp/target/store/XMLFilesBackend.cc Modified: trunk/libzypp/zypp/target/store/XMLFilesBackend.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/target/store/XMLFilesBackend.cc?rev=6859&r1=6858&r2=6859&view=diff ============================================================================== --- trunk/libzypp/zypp/target/store/XMLFilesBackend.cc (original) +++ trunk/libzypp/zypp/target/store/XMLFilesBackend.cc Fri Aug 24 10:29:50 2007 @@ -527,7 +527,7 @@ } catch( std::exception &e ) { - ZYPP_THROW (Exception( "Can't write flags to store") ); + ZYPP_THROW(Exception("Can't write flags to store")); } updateTimestamp(); } @@ -672,7 +672,8 @@ break; } } - catch (const Exception & excpt_r) { + catch (const Exception & excpt_r) + { ZYPP_CAUGHT( excpt_r ); WAR << "Skipping invalid patch file " << file_path << endl; } @@ -872,7 +873,9 @@ catch (const Exception & excpt_r) { ZYPP_CAUGHT(excpt_r); - ZYPP_THROW(Exception("Cannot create patch object")); + Exception nexcpt("Cannot create patch object"); + nexcpt.remember(excpt_r); + ZYPP_THROW(nexcpt); } return 0L; } @@ -909,7 +912,9 @@ catch (const Exception & excpt_r) { ZYPP_CAUGHT(excpt_r); - ZYPP_THROW(Exception("Cannot create atom object")); + Exception nexcpt("Cannot create atom object"); + nexcpt.remember(excpt_r); + ZYPP_THROW(nexcpt); } return 0L; } @@ -946,7 +951,9 @@ catch (const Exception & excpt_r) { ZYPP_CAUGHT(excpt_r); - ZYPP_THROW(Exception("Cannot create message object")); + Exception nexcpt("Cannot create message object"); + nexcpt.remember(excpt_r); + ZYPP_THROW(nexcpt); } return 0L; } @@ -985,7 +992,9 @@ catch (const Exception & excpt_r) { ZYPP_CAUGHT(excpt_r); - ZYPP_THROW(Exception("Cannot create script object")); + Exception nexcpt("Cannot create script object"); + nexcpt.remember(excpt_r); + ZYPP_THROW(nexcpt); } catch (const std::exception & excpt_r) { @@ -1005,7 +1014,9 @@ catch (const Exception & excpt_r) { ZYPP_CAUGHT(excpt_r); - ZYPP_THROW(Exception("Cannot create language object")); + Exception nexcpt("Cannot create language object"); + nexcpt.remember(excpt_r); + ZYPP_THROW(nexcpt); } return 0L; } @@ -1053,7 +1064,10 @@ } catch ( const Exception &e ) { - ZYPP_THROW(Exception("Error parsing update url: " + e.msg())); + ZYPP_CAUGHT(e); + Exception ne("Error parsing update url: " + e.msg()); + ne.remember(e); + ZYPP_THROW(ne); } } @@ -1068,7 +1082,10 @@ } catch ( const Exception &e ) { - ZYPP_THROW(Exception("Error parsing extra url: " + e.msg())); + ZYPP_CAUGHT(e); + Exception ne("Error parsing extra url: " + e.msg()); + ne.remember(e); + ZYPP_THROW(ne); } } @@ -1083,7 +1100,10 @@ } catch ( const Exception &e ) { - ZYPP_THROW(Exception("Error parsing optional url: " + e.msg())); + ZYPP_CAUGHT(e); + Exception ne("Error parsing optional url: " + e.msg()); + ne.remember(e); + ZYPP_THROW(ne); } } @@ -1150,7 +1170,9 @@ catch (const Exception & excpt_r) { ZYPP_CAUGHT(excpt_r); - ZYPP_THROW(Exception("Cannot create product object")); + Exception nexcpt("Cannot create product object"); + nexcpt.remember(excpt_r); + ZYPP_THROW(nexcpt); } return 0L; } @@ -1192,7 +1214,9 @@ catch (const Exception & excpt_r) { ZYPP_CAUGHT(excpt_r); - ZYPP_THROW(Exception("Cannot create installation pattern object")); + Exception nexcpt("Cannot create installation pattern object"); + nexcpt.remember(excpt_r); + ZYPP_THROW(nexcpt); } return 0L; } @@ -1233,7 +1257,9 @@ catch (const Exception & excpt_r) { ZYPP_CAUGHT(excpt_r); - ZYPP_THROW(Exception("Cannot create installation selection object")); + Exception nexcpt("Cannot create installation selection object"); + nexcpt.remember(excpt_r); + ZYPP_THROW(nexcpt); } return 0L; } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org