From a2992bdd062f2d1a0590b39312cbadc55e657787 Mon Sep 17 00:00:00 2001 From: Michael Andres Date: Fri, 14 Jan 2011 12:51:56 +0100 Subject: [PATCH] Report service plugin excetions during refresh, but continue. --- src/repos.cc | 13 +++++++++++++ zypper.spec.cmake | 2 +- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/repos.cc b/src/repos.cc index 1dcbf05..e5712e0 100644 --- a/src/repos.cc +++ b/src/repos.cc @@ -2637,6 +2637,19 @@ static bool refresh_service(Zypper & zypper, const ServiceInfo & service) manager.refreshService(service); error = false; } + catch ( const repo::ServicePluginInformalException & e ) + { + ZYPP_CAUGHT(e); + zypper.out().error(e, + str::form( + _("Problem retrieving the repository index file for service '%s':"), + (zypper.config().show_alias ? service.alias().c_str() : service.name().c_str())), + str::form( + _("Skipping service '%s' because of the above error."), + (zypper.config().show_alias ? service.alias().c_str() : service.name().c_str()))); + // this is just an informal note. The service will be used as is (usually empty) + error = false; + } catch (const MediaException & e) { ZYPP_CAUGHT(e); diff --git a/zypper.spec.cmake b/zypper.spec.cmake index b54597c..133a18c 100644 --- a/zypper.spec.cmake +++ b/zypper.spec.cmake @@ -11,7 +11,7 @@ # norootforbuild Name: @PACKAGE@ -BuildRequires: libzypp-devel >= 8.11.0 +BuildRequires: libzypp-devel >= 8.12.0 BuildRequires: boost-devel >= 1.33.1 BuildRequires: gettext-devel >= 0.15 BuildRequires: readline-devel >= 5.1 -- 2.7.4