Author: aschnell Date: Wed Aug 22 17:12:29 2007 New Revision: 6816 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6816&view=rev Log: - remember exception history Modified: trunk/libzypp/zypp/MediaSetAccess.cc Modified: trunk/libzypp/zypp/MediaSetAccess.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/MediaSetAccess.cc?rev=6816&r1=6815&r2=6816&view=diff ============================================================================== --- trunk/libzypp/zypp/MediaSetAccess.cc (original) +++ trunk/libzypp/zypp/MediaSetAccess.cc Wed Aug 22 17:12:29 2007 @@ -152,7 +152,9 @@ else if ( user == media::MediaChangeReport::IGNORE ) { DBG << "Skipping" << endl; - ZYPP_THROW ( SkipRequestException("User-requested skipping of a file") ); + SkipRequestException nexcp("User-requested skipping of a file"); + nexcp.remember(excp); + ZYPP_THROW(nexcp); } else if ( user == media::MediaChangeReport::EJECT ) { @@ -244,11 +246,11 @@ } // request media change, if the media is changeable and this is - // not just a check, otherwise just abort + // not just a check, otherwise just abort if (checkonly || !media_mgr.isChangeable(media)) user = media::MediaChangeReport::ABORT; else - user = + user = report->requestMedia ( Repository::noRepository, media_nr, @@ -266,8 +268,10 @@ else if ( user == media::MediaChangeReport::IGNORE ) { DBG << "Skipping" << endl; - ZYPP_THROW ( SkipRequestException("User-requested skipping of a file") ); - } + SkipRequestException nexcp("User-requested skipping of a file"); + nexcp.remember(excp); + ZYPP_THROW(nexcp); + } else if ( user == media::MediaChangeReport::EJECT ) { DBG << "Eject: try to release" << endl; @@ -383,7 +387,7 @@ } - // request media change, if the media is changeable, otherwise just abort + // request media change, if the media is changeable, otherwise just abort if (media_mgr.isChangeable(_media)) user = report->requestMedia( -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org