Author: schubi2
Date: Tue Dec 4 17:34:02 2007
New Revision: 8023
URL: http://svn.opensuse.org/viewcvs/zypp?rev=8023&view=rev
Log:
enlarged interface for additional requirements/conflicts
Modified:
trunk/libzypp/zypp/Resolver.cc
trunk/libzypp/zypp/Resolver.h
trunk/libzypp/zypp/solver/detail/Resolver.cc
trunk/libzypp/zypp/solver/detail/Resolver.h
Modified: trunk/libzypp/zypp/Resolver.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolver.cc?rev=8023&r1=8022&r2=8023&view=diff
==============================================================================
--- trunk/libzypp/zypp/Resolver.cc (original)
+++ trunk/libzypp/zypp/Resolver.cc Tue Dec 4 17:34:02 2007
@@ -103,7 +103,15 @@
void Resolver::addRequire (const Capability & capability)
{ _pimpl->addExtraCapability( capability ); }
void Resolver::addConflict (const Capability & capability)
- { _pimpl->addExtraConflict( capability ); }
+ { _pimpl->addExtraConflict( capability ); }
+ void Resolver::removeRequire (const Capability & capability)
+ { _pimpl->removeExtraCapability( capability ); }
+ void Resolver::removeConflict (const Capability & capability)
+ { _pimpl->removeExtraConflict( capability ); }
+ const CapSet Resolver::getRequire ()
+ { _pimpl->extraCapability();}
+ const CapSet Resolver::getConflict ()
+ { _pimpl->extraConflicts();}
std::list Resolver::problematicUpdateItems( void ) const
{ return _pimpl->problematicUpdateItems(); }
void Resolver::setTimeout( int seconds )
Modified: trunk/libzypp/zypp/Resolver.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/Resolver.h?rev=8023&r1=8022&r2=8023&view=diff
==============================================================================
--- trunk/libzypp/zypp/Resolver.h (original)
+++ trunk/libzypp/zypp/Resolver.h Tue Dec 4 17:34:02 2007
@@ -212,7 +212,8 @@
* (More or less a 'single step' resolver call)
*
* returns false if requirements are not all fulfillable
- *
+ *
+ * Is obsolete; use resolvePool() instead
*/
bool transactResObject( ResObject::constPtr robj, bool install = true);
@@ -225,6 +226,7 @@
*
* returns false if any transactResObject() call returned false.
*
+ * Is obsolete; use resolvePool() instead
*/
bool transactResKind( Resolvable::Kind kind );
@@ -235,6 +237,7 @@
* It will only reset states which have an equal or
* lower causer
*
+ * Is obsolete; use resolvePool() instead
*/
void transactReset( ResStatus::TransactByValue causer );
@@ -248,7 +251,31 @@
* Adding additional conflict
*
*/
- void addConflict (const Capability & capability);
+ void addConflict (const Capability & capability);
+
+ /**
+ * Remove additional requirement
+ *
+ */
+ void removeRequire (const Capability & capability);
+
+ /**
+ * Remove additional conflict
+ *
+ */
+ void removeConflict (const Capability & capability);
+
+ /**
+ * Get additional requirement
+ *
+ */
+ const CapSet getRequire ();
+
+ /**
+ * Get additional conflict
+ *
+ */
+ const CapSet getConflict();
/**
* Setting solver timeout
Modified: trunk/libzypp/zypp/solver/detail/Resolver.cc
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resolver.cc?rev=8023&r1=8022&r2=8023&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/Resolver.cc (original)
+++ trunk/libzypp/zypp/solver/detail/Resolver.cc Tue Dec 4 17:34:02 2007
@@ -439,7 +439,6 @@
}
-
void
Resolver::addExtraConflict (const Capability & capability)
{
@@ -448,6 +447,13 @@
void
+Resolver::removeExtraConflict (const Capability & capability)
+{
+ _extra_conflicts.erase (capability);
+}
+
+
+void
Resolver::addIgnoreConflict (const PoolItem_Ref item,
const Capability & capability)
{
Modified: trunk/libzypp/zypp/solver/detail/Resolver.h
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp/zypp/solver/detail/Resolver.h?rev=8023&r1=8022&r2=8023&view=diff
==============================================================================
--- trunk/libzypp/zypp/solver/detail/Resolver.h (original)
+++ trunk/libzypp/zypp/solver/detail/Resolver.h Tue Dec 4 17:34:02 2007
@@ -234,6 +234,7 @@
void addExtraCapability (const Capability & capability);
void removeExtraCapability (const Capability & capability);
void addExtraConflict (const Capability & capability);
+ void removeExtraConflict (const Capability & capability);
const CapSet extraCapability () { return _extra_caps; }
const CapSet extraConflicts () { return _extra_conflicts; }
--
To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org
For additional commands, e-mail: zypp-commit+help@opensuse.org
