Author: mlschroe
Date: Tue May 13 14:41:33 2008
New Revision: 10071
URL: http://svn.opensuse.org/viewcvs/zypp?rev=10071&view=rev
Log:
- expand mergesolv a bit
- fix tiny bug in cookie detection
Modified:
trunk/sat-solver/tools/common_write.c
trunk/sat-solver/tools/mergesolv.c
Modified: trunk/sat-solver/tools/common_write.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/common_write.c?rev=10071&r1=10070&r2=10071&view=diff
==============================================================================
--- trunk/sat-solver/tools/common_write.c (original)
+++ trunk/sat-solver/tools/common_write.c Tue May 13 14:41:33 2008
@@ -169,7 +169,10 @@
fileinfos = sat_zextend(fileinfos, nfileinfos, 1, sizeof(Repodatafile), REPODATAFILE_BLOCK);
pool_addfileprovides_ids(repo->pool, 0, &fileinfos[nfileinfos].addedfileprovides);
- if (repo->rpmdbcookie)
+ for (i = 0; i < 32; i++)
+ if (repo->rpmdbcookie[i])
+ break;
+ if (i < 32)
fileinfos[nfileinfos].rpmdbcookie = repo->rpmdbcookie;
if (fileinfos[nfileinfos].addedfileprovides || fileinfos[nfileinfos].rpmdbcookie)
nfileinfos++;
Modified: trunk/sat-solver/tools/mergesolv.c
URL: http://svn.opensuse.org/viewcvs/zypp/trunk/sat-solver/tools/mergesolv.c?rev=10071&r1=10070&r2=10071&view=diff
==============================================================================
--- trunk/sat-solver/tools/mergesolv.c (original)
+++ trunk/sat-solver/tools/mergesolv.c Tue May 13 14:41:33 2008
@@ -11,6 +11,7 @@
*/
#include