Author: jkupec Date: Wed Mar 12 15:29:15 2008 New Revision: 9104 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9104&view=rev Log: - remove bad calls to the media release() methods Modified: trunk/libzypp/tests/media/media2_test.cc trunk/libzypp/tests/media/media3_test.cc trunk/libzypp/zypp/MediaSetAccess.cc trunk/libzypp/zypp/media/MediaException.h trunk/libzypp/zypp/media/MediaManager.cc Modified: trunk/libzypp/tests/media/media2_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/media/media2_test.cc?rev=9104&r1=9103&r2=9104&view=diff ============================================================================== --- trunk/libzypp/tests/media/media2_test.cc (original) +++ trunk/libzypp/tests/media/media2_test.cc Wed Mar 12 15:29:15 2008 @@ -102,7 +102,7 @@ try { ONE_STEP("ONE: release()") - mm.release(one, true); + mm.release(one); //! \todo add the device argument once mm.getDevices() is ready } catch(const MediaException &e) { Modified: trunk/libzypp/tests/media/media3_test.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/tests/media/media3_test.cc?rev=9104&r1=9103&r2=9104&view=diff ============================================================================== --- trunk/libzypp/tests/media/media3_test.cc (original) +++ trunk/libzypp/tests/media/media3_test.cc Wed Mar 12 15:29:15 2008 @@ -114,8 +114,8 @@ { try { - ONE_STEP("SRC: release(eject=true)") - mm.release(src, true); + ONE_STEP("SRC: release(ejectDev=\"/dev/device\")") + mm.release(src);//! \todo add the device argument once mm.getDevices() is ready } catch(const MediaException &e) { Modified: trunk/libzypp/zypp/MediaSetAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.cc?rev=9104&r1=9103&r2=9104&view=diff ============================================================================== --- trunk/libzypp/zypp/MediaSetAccess.cc (original) +++ trunk/libzypp/zypp/MediaSetAccess.cc Wed Mar 12 15:29:15 2008 @@ -120,7 +120,7 @@ DBG << "Media couldn't provide file " << file << " , releasing." << endl; try { - media_mgr.release (media, false); + media_mgr.release (media); } catch (const Exception & excpt_r) { @@ -234,7 +234,7 @@ DBG << "Media couldn't provide file " << file << " , releasing." << endl; try { - media_mgr.release (media, false); + media_mgr.release (media); } catch (const Exception & excpt_r) { @@ -361,7 +361,7 @@ DBG << "Media couldn't provide dir " << dir << ", releasing." << endl; try { - media_mgr.release (_media, false); + media_mgr.release (_media); } catch (const Exception & excpt_r) { @@ -394,7 +394,7 @@ { reason = media::MediaChangeReport::WRONG; } - + unsigned int devindex = excp.deviceCurrent(); user = report->requestMedia(_url, Modified: trunk/libzypp/zypp/media/MediaException.h URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaException.h?rev=9104&r1=9103&r2=9104&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaException.h (original) +++ trunk/libzypp/zypp/media/MediaException.h Wed Mar 12 15:29:15 2008 @@ -58,7 +58,7 @@ unsigned int devCurrent) : Exception( msg_r ), _devices(devices), _dev_current(devCurrent) {} - + const std::vectorstd::string & devices() const { return _devices; } unsigned int deviceCurrent() const { return _dev_current; } Modified: trunk/libzypp/zypp/media/MediaManager.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/media/MediaManager.cc?rev=9104&r1=9103&r2=9104&view=diff ============================================================================== --- trunk/libzypp/zypp/media/MediaManager.cc (original) +++ trunk/libzypp/zypp/media/MediaManager.cc Wed Mar 12 15:29:15 2008 @@ -706,7 +706,7 @@ { DBG << "Releasing media id " << m->first << std::endl; m->second.desired = false; - m->second.handler->release(false); + m->second.handler->release(); } else { @@ -1124,7 +1124,7 @@ AttachedMedia ret = m->second.handler->attachedMedia(); if( ret.mediaSource && ret.mediaSource->equals( *media)) { - m->second.handler->release(false); + m->second.handler->release(); m->second.desired = false; } } -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org