ref: refs/heads/master
commit 40c0c5d8a57f1d10bd8c1af4b21115de2d53ee08
Author: Ján Kupec
Date: Fri Dec 4 14:57:42 2009 +0100
Report invalid alias exception from libzypp (bnc #473834)
---
src/repos.cc | 8 ++++++++
zypper.spec.cmake | 2 +-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/repos.cc b/src/repos.cc
index 7ba87a4..46a7366 100644
--- a/src/repos.cc
+++ b/src/repos.cc
@@ -1366,6 +1366,14 @@ void add_repo(Zypper & zypper, RepoInfo & repo)
manager.addRepository(repo);
repo = manager.getRepo(repo);
}
+ catch (const RepoInvalidAliasException & e)
+ {
+ ZYPP_CAUGHT(e);
+ zypper.out().error(e,
+ boost::str(format(_("Invalid repository alias: '%s'")) % repo.alias()));
+ zypper.setExitCode(ZYPPER_EXIT_ERR_INVALID_ARGS);
+ return;
+ }
catch (const RepoAlreadyExistsException & e)
{
ZYPP_CAUGHT(e);
diff --git a/zypper.spec.cmake b/zypper.spec.cmake
index aaea533..e4d8c75 100644
--- a/zypper.spec.cmake
+++ b/zypper.spec.cmake
@@ -11,7 +11,7 @@
# norootforbuild
Name: @PACKAGE@
-BuildRequires: libzypp-devel >= 6.25.0 boost-devel >= 1.33.1 gettext-devel >= 0.15
+BuildRequires: libzypp-devel >= 6.26.2 boost-devel >= 1.33.1 gettext-devel >= 0.15
BuildRequires: readline-devel >= 5.1 augeas-devel >= 0.5.0
BuildRequires: gcc-c++ >= 4.1 cmake >= 2.4.6
Requires: procps
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
