ref: refs/heads/SuSE-Linux-11_0-Branch
commit 743a48beb3f358c7cc703e3130175ee40016fa25
Author: Ján Kupec
Date: Wed Apr 15 11:16:53 2009 +0200
Fixed requesting of perl symbols in 'install' (bnc #433679)
---
src/zypper-misc.cc | 8 +++++++-
1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/src/zypper-misc.cc b/src/zypper-misc.cc
index 0a23865..bf467db 100644
--- a/src/zypper-misc.cc
+++ b/src/zypper-misc.cc
@@ -494,7 +494,13 @@ void install_remove(Zypper & zypper,
string::size_type pos;
- if ((pos = str.rfind(':')) != string::npos)
+ // force repository specified by prefixing 'repo:' to the package name
+ if (!force_by_capability &&
+ //! \todo FIXME this causes problems when requesting symbols containing
+ //! ':', like perl(Foo::Bar). Maybe we should drop or introduce another
+ //! way to enforce repo per package.
+ (pos = str.rfind(':')) != string::npos &&
+ !(str.find("perl(") == 0)) // bnc #433679
{
repo = str.substr(0, pos);
str = str.substr(pos + 1);
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
Ján Kupec