Ignore failed-eject-exception on media change (bnc#865705)

diff --git a/zypp/MediaSetAccess.cc b/zypp/MediaSetAccess.cc
index 240b60b..a7c5f8d 100644 (file)
--- a/zypp/MediaSetAccess.cc
+++ b/zypp/MediaSetAccess.cc
@@ -299,10 +299,15 @@ IMPL_PTR_TYPE(MediaSetAccess);
           else if ( user == media::MediaChangeReport::EJECT )
           {
             DBG << "Eject: try to release" << endl;
-            media_mgr.releaseAll();
-            // eject
-            media_mgr.release (media,
-              devindex < devices.size() ? devices[devindex] : "");
+           try
+           {
+             media_mgr.releaseAll();
+             media_mgr.release (media, devindex < devices.size() ? devices[devindex] : "");
+           }
+           catch ( const Exception & e)
+           {
+             ZYPP_CAUGHT(e);
+           }
           }
           else if ( user == media::MediaChangeReport::RETRY  ||
             user == media::MediaChangeReport::CHANGE_URL )

diff --git a/zypp/media/MediaCD.cc b/zypp/media/MediaCD.cc
index d1c3590..172ea3e 100644 (file)
--- a/zypp/media/MediaCD.cc
+++ b/zypp/media/MediaCD.cc
@@ -41,7 +41,7 @@ extern "C"
 /*
 ** if to throw exception on eject errors or ignore them
 */
-#define  REPORT_EJECT_ERRORS     1
+#define  REPORT_EJECT_ERRORS     0
 
 /*
 ** If defined to the full path of the eject utility,