Author: schubi2 Date: Fri Apr 11 16:57:14 2008 New Revision: 9542 URL: http://svn.opensuse.org/viewcvs/zypp?rev=9542&view=rev Log: taking satisfied/broken state from ResStatus Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/patch/patch-test.xml trunk/libzypp-testsuite/solver/deptestomatic.howto trunk/libzypp-testsuite/solver/src/deptestomatic.cc Modified: trunk/libzypp-testsuite/solver/data.deptestomatic/patch/patch-test.xml URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/data.deptestomatic/patch/patch-test.xml?rev=9542&r1=9541&r2=9542&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/data.deptestomatic/patch/patch-test.xml (original) +++ trunk/libzypp-testsuite/solver/data.deptestomatic/patch/patch-test.xml Fri Apr 11 16:57:14 2008 @@ -37,7 +37,9 @@ <channel file="patch-135979712-package.xml.gz" name="openSUSE-10.3-retail 10.3" /> </setup> <trial> -<isSatisfied channel="patch" kind="patch" name="rpm-2186-0"/> -<isSatisfied kind="patch"/> +<validate channel="patch" kind="patch" name="rpm-2186-0"/> +<validate kind="patch"/> +<showpool prefix="VALIDATE" all="yes"/> + </trial> </test> Modified: trunk/libzypp-testsuite/solver/deptestomatic.howto URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/deptestomatic.howto?rev=9542&r1=9541&r2=9542&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/deptestomatic.howto (original) +++ trunk/libzypp-testsuite/solver/deptestomatic.howto Fri Apr 11 16:57:14 2008 @@ -99,9 +99,9 @@ <keep channel="..." name="..." kind="..."/> <!-- locks the package from channel --> - <isSatisfied channel="..." name="..." kind="..."/> <!-- check ONE resolvable if it is satisfied --> + <validate channel="..." name="..." kind="..."/> <!-- check ONE resolvable if it is satisfied --> - <isSatisfied kind="..."/> <!-- check all resolvables of a specific kind if it is satisfied --> + <validate kind="..."/> <!-- check all resolvables of a specific kind if it is satisfied --> <availablelocales/> <!-- lists the available locales --> Modified: trunk/libzypp-testsuite/solver/src/deptestomatic.cc URL: http://svn.opensuse.org/viewcvs/zypp/trunk/libzypp-testsuite/solver/src/deptestomatic.cc?rev=9542&r1=9541&r2=9542&view=diff ============================================================================== --- trunk/libzypp-testsuite/solver/src/deptestomatic.cc (original) +++ trunk/libzypp-testsuite/solver/src/deptestomatic.cc Fri Apr 11 16:57:14 2008 @@ -369,8 +369,10 @@ { if (p.isSatisfied()) RESULT << p << " IS SATISFIED" << endl; - else - RESULT << p << " IS NOT SATISFIED" << endl; + else if(p.isBroken()) + RESULT << p << " IS BROKEN" << endl; + else if(p.isRelevant()) + RESULT << p << " IS RELEVANT" << endl; return true; } }; @@ -1084,13 +1086,16 @@ } else { cerr << "Unknown package " << source_alias << "::" << package_name << endl; } - } else if (node->equals ("isSatisfied")) { + } else if (node->equals ("validate")) { string source_alias = node->getProp ("channel"); string package_name = node->getProp ("name"); if (package_name.empty()) package_name = node->getProp ("package"); string kind_name = node->getProp ("kind"); + // Solving is needed + resolver->resolvePool(); + if (!package_name.empty()) { PoolItem poolItem; poolItem = get_poolItem (source_alias, package_name, kind_name); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org