Attachment 174167 Details for Bug 293428

[patch] proposed patch

zypp-#293428.diff (text/plain), 4.34 KB, created by Jan Kupec on 2007-09-24 09:19:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Kupec

Created: 2007-09-24 09:19:35 UTC

Size: 4.34 KB

patch

obsolete

>Index: zypp/MediaSetAccess.cc
>===================================================================
>--- zypp/MediaSetAccess.cc	(revision 7334)
>+++ zypp/MediaSetAccess.cc	(working copy)
>@@ -166,17 +166,8 @@
>           else if ( user == media::MediaChangeReport::EJECT )
>           {
>             DBG << "Eject: try to release" << endl;
>-            try
>-            {
>-              //zypp::SourceManager::sourceManager()->releaseAllSources();
>-            }
>-            catch (const zypp::Exception& excpt_r)
>-            {
>-              ZYPP_CAUGHT(excpt_r);
>-              ERR << "Failed to release all sources" << endl;
>-            }
>+            media_mgr.releaseAll();
>             media_mgr.release (media, true); // one more release needed for eject
>-            // FIXME: this will not work, probably
>           }
>           else if ( user == media::MediaChangeReport::RETRY  ||
>             user == media::MediaChangeReport::CHANGE_URL )
>@@ -283,17 +274,8 @@
>           else if ( user == media::MediaChangeReport::EJECT )
>           {
>             DBG << "Eject: try to release" << endl;
>-            try
>-            {
>-              //zypp::SourceManager::sourceManager()->releaseAllSources();
>-            }
>-            catch (const zypp::Exception& excpt_r)
>-            {
>-              ZYPP_CAUGHT(excpt_r);
>-              ERR << "Failed to release all sources" << endl;
>-            }
>+            media_mgr.releaseAll();
>             media_mgr.release (media, true); // one more release needed for eject
>-            // FIXME: this will not work, probably
>           }
>           else if ( user == media::MediaChangeReport::RETRY  ||
>             user == media::MediaChangeReport::CHANGE_URL )
>@@ -414,18 +396,8 @@
>           else if (user == media::MediaChangeReport::EJECT)
>           {
>             DBG << "Eject: try to release" << endl;
>-            try
>-            {
>-              //! \todo do we need replacement for this at all?
>-              // zypp::SourceManager::sourceManager()->releaseAllSources();
>-            }
>-            catch (const zypp::Exception& excpt_r)
>-            {
>-              ZYPP_CAUGHT(excpt_r);
>-              ERR << "Failed to release all sources" << endl;
>-            }
>+            media_mgr.releaseAll();
>             media_mgr.release (_media, true); // one more release needed for eject
>-            // FIXME: this will not work, probably
>           }
>           else if (user == media::MediaChangeReport::RETRY ||
>               user == media::MediaChangeReport::CHANGE_URL)
>Index: zypp/media/MediaManager.h
>===================================================================
>--- zypp/media/MediaManager.h	(revision 7334)
>+++ zypp/media/MediaManager.h	(working copy)
>@@ -603,6 +603,12 @@
>       release(MediaAccessId accessId, bool eject = false);
> 
>       /**
>+       * Release all attached media.
>+       */
>+      void
>+      releaseAll();
>+
>+      /**
>        * Disconnect a remote media.
>        *
>        * This is useful for media which e.g. holds open a connection
>Index: zypp/media/MediaManager.cc
>===================================================================
>--- zypp/media/MediaManager.cc	(revision 7334)
>+++ zypp/media/MediaManager.cc	(working copy)
>@@ -685,6 +685,43 @@
> 
>     // ---------------------------------------------------------------
>     void
>+    MediaManager::releaseAll()
>+    {
>+      MutexLock glock(g_Mutex);
>+
>+      MIL << "Releasing all attached media" << std::endl;
>+
>+      ManagedMediaMap::iterator m(m_impl->mediaMap.begin());
>+      for( ; m != m_impl->mediaMap.end(); ++m)
>+      {
>+        if( m->second.handler->dependsOnParent())
>+          continue;
>+
>+        try
>+        {
>+          if(m->second.handler->isAttached())
>+          {
>+            DBG << "Releasing media id " << m->first << std::endl;
>+            m->second.desired  = false;
>+            m->second.handler->release(false);
>+          }
>+          else
>+          {
>+            DBG << "Media id " << m->first << " not attached " << std::endl;
>+          }
>+        }
>+        catch(const MediaException & e)
>+        {
>+          ZYPP_CAUGHT(e);
>+          ERR << "Failed to release media id " << m->first << std::endl;
>+        }
>+      }
>+
>+      MIL << "Exit" << std::endl;
>+    }
>+
>+    // ---------------------------------------------------------------
>+    void
>     MediaManager::disconnect(MediaAccessId accessId)
>     {
>       MutexLock glock(g_Mutex);

Actions: View | Diff

Attachments on bug 293428: 161299 | 162117 | 163443 | 173271 | 173891 | 174167 | 174527