Author: mlandres Date: Wed Aug 6 16:18:29 2008 New Revision: 10762 URL: http://svn.opensuse.org/viewcvs/zypp?rev=10762&view=rev Log: - Don't let exception escape MediaSetAccess dtor (bnc #415017) Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes branches/SuSE-Linux-11_0-Branch/libzypp/zypp/MediaSetAccess.cc Modified: branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake?rev=10762&r1=10761&r2=10762&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/VERSION.cmake Wed Aug 6 16:18:29 2008 @@ -47,4 +47,4 @@ SET(LIBZYPP_MAJOR "4") SET(LIBZYPP_MINOR "27") SET(LIBZYPP_COMPATMINOR "24") -SET(LIBZYPP_PATCH "0") +SET(LIBZYPP_PATCH "1") Modified: branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes?rev=10762&r1=10761&r2=10762&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/package/libzypp.changes Wed Aug 6 16:18:29 2008 @@ -1,4 +1,11 @@ ------------------------------------------------------------------- +Wed Aug 6 16:15:25 CEST 2008 ma@suse.de + +- Don't let exception escape MediaSetAccess dtor (bnc #415017) +- revision 10762 +- version 4.27.1 + +------------------------------------------------------------------- Tue Jul 22 15:23:22 CEST 2008 - ma@suse.de - Provide Package::url() if available in solv file. (bnc #402434) Modified: branches/SuSE-Linux-11_0-Branch/libzypp/zypp/MediaSetAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/branches/SuSE-Linux-11_0-Branch/libzypp/zypp/MediaSetAccess.cc?rev=10762&r1=10761&r2=10762&view=diff ============================================================================== --- branches/SuSE-Linux-11_0-Branch/libzypp/zypp/MediaSetAccess.cc (original) +++ branches/SuSE-Linux-11_0-Branch/libzypp/zypp/MediaSetAccess.cc Wed Aug 6 16:18:29 2008 @@ -44,7 +44,11 @@ MediaSetAccess::~MediaSetAccess() { - release(); + try + { + release(); + } + catch(...) {} // don't let exception escape a dtor. } @@ -88,14 +92,14 @@ { media::MediaManager media_mgr; media::MediaAccessId media; - + media = getMediaAccessId( media_nr); DBG << "Going to release file " << file << " from media number " << media_nr << endl; - + if ( ! media_mgr.isAttached(media) ) return; //disattached media is free - + media_mgr.releaseFile (media, file); } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org