ref: refs/heads/SuSE-SLE-10-SP2-Branch
commit 99126df41cecf6a2dcd8d698e803db8e95563503
Author: Michael Andres
Date: Fri Jun 5 16:21:45 2009 +0200
Don't reject modalias dependencies with "op edition" part. (bnc #505627)
---
zypp/CapFactory.cc | 7 +------
1 files changed, 1 insertions(+), 6 deletions(-)
diff --git a/zypp/CapFactory.cc b/zypp/CapFactory.cc
index 614243b..f3a6eb2 100644
--- a/zypp/CapFactory.cc
+++ b/zypp/CapFactory.cc
@@ -344,11 +344,6 @@ namespace zypp
Rel op_r = Rel::ANY,
const std::string & value_r = std::string() )
{
- if ( op_r != Rel::ANY )
- {
- ZYPP_THROW( Exception("Unsupported kind of Modalias Capability '" + op_r.asString() + "'") );
- }
-
//split: modalias(name) [op string]
static const str::regex rx( "modalias\\(([^)]*)\\)" );
str::smatch what;
@@ -357,7 +352,7 @@ namespace zypp
// Modalias always refers to 'System' kind of Resolvable.
return usetInsert
( new capability::ModaliasCap( ResTraits<SystemResObject>::kind,
- what[1].str() ) );
+ what[1].str(), op_r, value_r ) );
}
// otherwise
ZYPP_THROW( Exception("Unsupported kind of Modalias Capability'" + name_r + "'") );
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
