- get rid of a couple of warnings when building for debian

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

diff --git a/tools/mergesolv.c b/tools/mergesolv.c
index 653de47..8ff4857 100644 (file)
--- a/tools/mergesolv.c
+++ b/tools/mergesolv.c
@@ -49,7 +49,7 @@ loadcallback (Pool *pool, Repodata *data, void *vdata)
       perror(location);
       return 0;
     }
-  r = repo_add_solv_flags(data->repo, fp, REPO_USE_LOADING|REPO_LOCALPOOL);
+  r = repo_add_solv(data->repo, fp, REPO_USE_LOADING|REPO_LOCALPOOL);
   fclose(fp);
   return r ? 0 : 1;
 }
@@ -94,7 +94,11 @@ main(int argc, char **argv)
          perror(argv[optind]);
          exit(1);
        }
-      repo_add_solv(repo, fp);
+      if (repo_add_solv(repo, fp, 0))
+       {
+         fprintf(stderr, "repo %s: %s\n", argv[optind], pool_errstr(pool));
+         exit(1);
+       }
       fclose(fp);
     }
   tool_write(repo, basefile, 0);