From 21e30a591750e81c840c4f4d64530402a25886b4 Mon Sep 17 00:00:00 2001 From: Stefan Schubert Date: Wed, 18 Jul 2007 14:10:03 +0000 Subject: [PATCH] added new calls in Resolver.h: addRequire,addConflict --- package/libzypp.changes | 5 +++++ zypp/Resolver.cc | 4 ++++ zypp/Resolver.h | 12 ++++++++++++ 3 files changed, 21 insertions(+) diff --git a/package/libzypp.changes b/package/libzypp.changes index a929e2b..4e83619 100644 --- a/package/libzypp.changes +++ b/package/libzypp.changes @@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Wed Jul 18 16:09:04 CEST 2007 - schubi@suse.de + +- added new calls in Resolver.h: addRequire,addConflict + +------------------------------------------------------------------- Wed Jul 18 14:43:04 CEST 2007 - ma@suse.de - Fixed IniParser to allow '=' in vaues (#292669) diff --git a/zypp/Resolver.cc b/zypp/Resolver.cc index 5c7a1f4..e447623 100644 --- a/zypp/Resolver.cc +++ b/zypp/Resolver.cc @@ -98,6 +98,10 @@ namespace zypp { return _pimpl->transactResKind( kind ); } void Resolver::transactReset( ResStatus::TransactByValue causer ) { _pimpl->transactReset( causer ); } + void Resolver::addRequire (const Capability & capability) + { _pimpl->addExtraCapability( capability ); } + void Resolver::addConflict (const Capability & capability) + { _pimpl->addExtraConflict( capability ); } std::list Resolver::problematicUpdateItems( void ) const { return _pimpl->problematicUpdateItems(); } void Resolver::setTimeout( int seconds ) diff --git a/zypp/Resolver.h b/zypp/Resolver.h index 5688157..edbfca9 100644 --- a/zypp/Resolver.h +++ b/zypp/Resolver.h @@ -238,6 +238,18 @@ namespace zypp void transactReset( ResStatus::TransactByValue causer ); /** + * Adding additional requirement + * + */ + void addRequire (const Capability & capability); + + /** + * Adding additional conflict + * + */ + void addConflict (const Capability & capability); + + /** * Setting solver timeout * * Stop solving after a given timeframe (seconds) -- 2.7.4