Author: mlschroe Date: Thu Dec 6 19:55:58 2007 New Revision: 8053 URL: http://svn.opensuse.org/viewcvs/zypp?rev=8053&view=rev Log: added some DEBIAN_SEMANTICS Modified: trunk/sat-solver/src/evr.c trunk/sat-solver/src/pool.c Modified: trunk/sat-solver/src/evr.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/evr.c?rev=8053&r1=8052&r2=8053&view=diff ============================================================================== --- trunk/sat-solver/src/evr.c (original) +++ trunk/sat-solver/src/evr.c Thu Dec 6 19:55:58 2007 @@ -135,6 +135,12 @@ r = vercmp(evr1, r1 ? r1 : s1, evr2, r2 ? r2 : s2); if (r) return r; +#ifdef DEBIAN_SEMANTICS + if (!r1 && r2) + return -1; + if (r1 && !r2) + return 1; +#endif if (r1 && r2) { if (s1 != ++r1 && s2 != ++r2) Modified: trunk/sat-solver/src/pool.c URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/src/pool.c?rev=8053&r1=8052&r2=8053&view=diff ============================================================================== --- trunk/sat-solver/src/pool.c (original) +++ trunk/sat-solver/src/pool.c Thu Dec 6 19:55:58 2007 @@ -528,7 +528,14 @@ Id pevr; if (pid == name) - break; /* yes, provides all versions */ + { +#ifdef DEBIAN_SEMANTICS + continue; /* unversioned provides can + * never match versioned deps */ +#else + break; /* yes, provides all versions */ +#endif + } if (!ISRELDEP(pid)) continue; /* wrong provides name */ prd = GETRELDEP(pool, pid); -- To unsubscribe, e-mail: zypp-commit+unsubscribe@opensuse.org For additional commands, e-mail: zypp-commit+help@opensuse.org