summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorMichael Schroeder <mls@suse.de>2013-04-08 11:36:43 +0200
committerMichael Schroeder <mls@suse.de>2013-04-08 11:36:43 +0200
commit2bb9ff59dde27663a23fa798419f4bd6ab91d1be (patch)
treeef568f1ed1b1d4a284376d75e6f5d8da5f735a8b /src
parentb93033c48c7607c8ed91fe8bab904840a6ae6ad3 (diff)
downloadlibsolv-2bb9ff59dde27663a23fa798419f4bd6ab91d1be.tar.gz
libsolv-2bb9ff59dde27663a23fa798419f4bd6ab91d1be.tar.bz2
libsolv-2bb9ff59dde27663a23fa798419f4bd6ab91d1be.zip
fix bugs in fileconflicts code and prepare for aliased dirs
Breaks API but that should not be a problem as noone seems to use the function yet.
Diffstat (limited to 'src')
-rw-r--r--src/pool.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/pool.c b/src/pool.c
index 21b2860..2bcb71c 100644
--- a/src/pool.c
+++ b/src/pool.c
@@ -2142,12 +2142,12 @@ pool_add_fileconflicts_deps(Pool *pool, Queue *conflicts)
if (!conflicts->count)
return;
- for (i = 0; i < conflicts->count; i += 5)
+ for (i = 0; i < conflicts->count; i += 6)
{
fn = conflicts->elements[i];
p = conflicts->elements[i + 1];
md5 = conflicts->elements[i + 2];
- q = conflicts->elements[i + 3];
+ q = conflicts->elements[i + 4];
id = pool_rel2id(pool, fn, md5, REL_FILECONFLICT, 1);
s = pool->solvables + p;
if (!s->repo)