Author: dmacvicar Date: Tue Aug 28 18:51:35 2007 New Revision: 6943 URL: http://svn.opensuse.org/viewcvs/zypp?rev=6943&view=rev Log: - let skip failed packages to work #297001 Modified: trunk/libzypp/zypp/repo/PackageProvider.cc trunk/libzypp/zypp/repo/RepoProvideFile.cc Modified: trunk/libzypp/zypp/repo/PackageProvider.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/PackageProvider.cc?rev=6943&r1=6942&r2=6943&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/PackageProvider.cc (original) +++ trunk/libzypp/zypp/repo/PackageProvider.cc Tue Aug 28 18:51:35 2007 @@ -308,6 +308,9 @@ case repo::DownloadResolvableReport::IGNORE: ZYPP_THROW(SkipRequestException("User requested skip of corrupted file")); break; + case repo::DownloadResolvableReport::ABORT: + ZYPP_THROW(AbortRequestException("User requested to abort")); + break; default: break; } Modified: trunk/libzypp/zypp/repo/RepoProvideFile.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/repo/RepoProvideFile.cc?rev=6943&r1=6942&r2=6943&view=diff ============================================================================== --- trunk/libzypp/zypp/repo/RepoProvideFile.cc (original) +++ trunk/libzypp/zypp/repo/RepoProvideFile.cc Tue Aug 28 18:51:35 2007 @@ -17,6 +17,7 @@ #include "zypp/base/Gettext.h" #include "zypp/base/Logger.h" #include "zypp/base/String.h" +#include "zypp/base/UserRequestException.h" #include "zypp/repo/RepoProvideFile.h" #include "zypp/ZYppCallbacks.h" #include "zypp/MediaSetAccess.h" @@ -256,6 +257,16 @@ MIL << "provideFile at " << ret << endl; return ret; } + catch ( const SkipRequestException &e ) + { + ZYPP_CAUGHT( e ); + ZYPP_RETHROW(e); + } + catch ( const AbortRequestException &e ) + { + ZYPP_CAUGHT( e ); + ZYPP_RETHROW(e); + } catch ( const Exception &e ) { ZYPP_CAUGHT( e ); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org