support -X option in rpmmd2solv, make add_autopattern available in bindings

[platform/upstream/libsolv.git] / tools / findfileconflicts.c

diff --git a/tools/findfileconflicts.c b/tools/findfileconflicts.c
index cb90f54..712602d 100644 (file)
--- a/tools/findfileconflicts.c
+++ b/tools/findfileconflicts.c
@@ -17,13 +17,17 @@ iterate_handle(Pool *pool, Id p, void *cbdata)
 {
   Solvable *s = pool->solvables + p;
   Id rpmdbid;
+  void *handle;
   
   if (!s->repo->rpmdbid)
     return 0;
   rpmdbid = s->repo->rpmdbid[p - s->repo->start];
   if (!rpmdbid)
     return 0;
-  return rpm_byrpmdbid(cbdata, rpmdbid);
+  handle = rpm_byrpmdbid(cbdata, rpmdbid);
+  if (!handle)
+    fprintf(stderr, "rpm_byrpmdbid: %s\n", pool_errstr(pool));
+  return handle;
 }
 
 int main(int argc, char **argv)
@@ -54,7 +58,7 @@ int main(int argc, char **argv)
   queue_init(&conflicts);
   FOR_REPO_SOLVABLES(installed, p, s)
     queue_push(&todo, p);
-  state = rpm_state_create(pool_get_rootdir(pool));
+  state = rpm_state_create(pool, pool_get_rootdir(pool));
   pool_findfileconflicts(pool, &todo, 0, &conflicts, FINDFILECONFLICTS_USE_SOLVABLEFILELIST | FINDFILECONFLICTS_CHECK_DIRALIASING | FINDFILECONFLICTS_USE_ROOTDIR, &iterate_handle, state);
   rpm_state_free(state);
   queue_free(&todo);