ref: refs/heads/ma-misc
commit 84edb0c020547ce5d5a5353c0e8e6382363f1e63
Author: Michael Andres
Date: Fri Jul 3 09:30:00 2009 +0200
Fix exception handling when unmounting iso images (bnc #517856)
---
zypp/media/MediaISO.cc | 12 +++++++++++-
1 files changed, 11 insertions(+), 1 deletions(-)
diff --git a/zypp/media/MediaISO.cc b/zypp/media/MediaISO.cc
index 3fee74f..8193795 100644
--- a/zypp/media/MediaISO.cc
+++ b/zypp/media/MediaISO.cc
@@ -299,8 +299,18 @@ namespace zypp
if( _parentId)
{
+ // Unmounting the iso already succeeded,
+ // so don't let exceptions escape.
MediaManager manager;
- manager.release(_parentId);
+ try
+ {
+ manager.release(_parentId);
+ }
+ catch ( const Exception & excpt_r )
+ {
+ ZYPP_CAUGHT( excpt_r );
+ WAR << "Not been able to cleanup the parent mount." << endl;
+ }
}
// else:
// the media manager has reset the _parentId
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
