- rename repo_add_solv_flags to repo_add_solv. Should have done this a couple of...

diff --git a/bindings/solv.i b/bindings/solv.i
index b34eb23..fdf548d 100644 (file)
--- a/bindings/solv.i
+++ b/bindings/solv.i
@@ -1093,12 +1093,12 @@ typedef struct {
     int r;
     if (!fp)
       return 0;
-    r = repo_add_solv_flags($self, fp, flags);
+    r = repo_add_solv($self, fp, flags);
     fclose(fp);
     return r == 0;
   }
   bool add_solv(FILE *fp, int flags = 0) {
-    return repo_add_solv_flags($self, fp, flags) == 0;
+    return repo_add_solv($self, fp, flags) == 0;
   }
 
   XSolvable *add_solvable() {
@@ -2444,7 +2444,7 @@ rb_eval_string(
     Repodata *data = repo_id2repodata($self->repo, $self->id);
     int r, oldstate = data->state;
     data->state = REPODATA_LOADING;
-    r = repo_add_solv_flags(data->repo, fp, flags | REPO_USE_LOADING);
+    r = repo_add_solv(data->repo, fp, flags | REPO_USE_LOADING);
     if (r || data->state == REPODATA_LOADING)
       data->state = oldstate;
     return r;

diff --git a/examples/solv.c b/examples/solv.c
index 431af0e..8ea27d0 100644 (file)
--- a/examples/solv.c
+++ b/examples/solv.c
@@ -1062,7 +1062,7 @@ usecachedrepo(Repo *repo, const char *repoext, unsigned char *cookie, int mark)
         flags |= REPO_LOCALPOOL;       /* no local pool for DL so that we can compare IDs */
     }
 
-  if (repo_add_solv_flags(repo, fp, flags))
+  if (repo_add_solv(repo, fp, flags))
     {
       fclose(fp);
       return 0;
@@ -1176,7 +1176,7 @@ writecachedrepo(Repo *repo, Repodata *info, const char *repoext, unsigned char *
            {
              /* main repo */
              repo_empty(repo, 1);
-             if (repo_add_solv_flags(repo, fp, SOLV_ADD_NO_STUBS))
+             if (repo_add_solv(repo, fp, SOLV_ADD_NO_STUBS))
                {
                  /* oops, no way to recover from here */
                  fprintf(stderr, "internal error\n");
@@ -1190,7 +1190,7 @@ writecachedrepo(Repo *repo, Repodata *info, const char *repoext, unsigned char *
              repodata_extend_block(info, repo->start, repo->end - repo->start);
              info->state = REPODATA_LOADING;
              /* no need for LOCALPOOL as pool already contains ids */
-             repo_add_solv_flags(repo, fp, REPO_USE_LOADING|REPO_EXTEND_SOLVABLES);
+             repo_add_solv(repo, fp, REPO_USE_LOADING|REPO_EXTEND_SOLVABLES);
              info->state = REPODATA_AVAILABLE; /* in case the load failed */
            }
          fclose(fp);
@@ -1654,7 +1654,7 @@ read_repos(Pool *pool, struct repoinfo *repoinfos, int nrepoinfos)
       if ((ofp = fopen(calccachepath(repo, 0), "r")) != 0)
        {
          Repo *ref = repo_create(pool, "@System.old");
-         if (!repo_add_solv(ref, ofp))
+         if (!repo_add_solv(ref, ofp, 0))
            {
              repo_add_rpmdb(repo, ref, 0, REPO_REUSE_REPODATA);
              done = 1;

diff --git a/ext/testcase.c b/ext/testcase.c
index 052560f..d8c8354 100644 (file)
--- a/ext/testcase.c
+++ b/ext/testcase.c
@@ -19,6 +19,7 @@
 #include "poolvendor.h"
 #include "repo.h"
 #include "repo_susetags.h"
+#include "repo_solv.h"
 #include "solver.h"
 #include "solverdebug.h"
 #include "chksum.h"
@@ -1722,6 +1723,11 @@ testcase_read(Pool *pool, FILE *fp, char *testcase, Queue *job, char **resultp,
                  testcase_add_susetags(repo, rfp, 0);
                  fclose(rfp);
                }
+             else if (!strcmp(pieces[3], "solv"))
+               {
+                 repo_add_solv(repo, rfp, 0);
+                 fclose(rfp);
+               }
              else
                {
                  fclose(rfp);

diff --git a/src/libsolv.ver b/src/libsolv.ver
index 377b3db..9a200a5 100644 (file)
--- a/src/libsolv.ver
+++ b/src/libsolv.ver
@@ -114,7 +114,6 @@ SOLV_1.0 {
                repo_add_poolstr_array;
                repo_add_repodata;
                repo_add_solv;
-               repo_add_solv_flags;
                repo_add_solvable;
                repo_add_solvable_block;
                repo_addid;

diff --git a/src/repo_solv.c b/src/repo_solv.c
index 2d29001..4e1b0b8 100644 (file)
--- a/src/repo_solv.c
+++ b/src/repo_solv.c
@@ -414,7 +414,7 @@ incore_add_u8(Repodata *data, unsigned int x)
  */
 
 int
-repo_add_solv_flags(Repo *repo, FILE *fp, int flags)
+repo_add_solv(Repo *repo, FILE *fp, int flags)
 {
   Pool *pool = repo->pool;
   int i, l;
@@ -1323,8 +1323,3 @@ printf("=> %s %s %p\n", pool_id2str(pool, keys[key].name), pool_id2str(pool, key
   return 0;
 }
 
-int
-repo_add_solv(Repo *repo, FILE *fp)
-{
-  return repo_add_solv_flags(repo, fp, 0);
-}

diff --git a/src/repo_solv.h b/src/repo_solv.h
index 1cd1d50..8d5c32b 100644 (file)
--- a/src/repo_solv.h
+++ b/src/repo_solv.h
@@ -22,8 +22,7 @@ extern "C" {
 #include "pool.h"
 #include "repo.h"
 
-extern int repo_add_solv(Repo *repo, FILE *fp);
-extern int repo_add_solv_flags(Repo *repo, FILE *fp, int flags);
+extern int repo_add_solv(Repo *repo, FILE *fp, int flags);
 
 #define SOLV_ADD_NO_STUBS      (1 << 8)
 

diff --git a/src/rules.c b/src/rules.c
index 135d6c7..0530ccc 100644 (file)
--- a/src/rules.c
+++ b/src/rules.c
@@ -2419,7 +2419,7 @@ solver_createcleandepsmap(Solver *solv, Map *cleandepsmap, int unneeded)
                  if (strncmp(pool_id2str(pool, pool->solvables[p].name), "pattern", 7) != 0)
                    continue;
                  MAPSET(&userinstalled, p - installed->start);
-           }
+               }
        }
       dataiterator_free(&di);
     }

diff --git a/tools/dumpsolv.c b/tools/dumpsolv.c
index 23ceaa3..4df9d8c 100644 (file)
--- a/tools/dumpsolv.c
+++ b/tools/dumpsolv.c
@@ -194,7 +194,7 @@ printf("loc %s\n", location);
       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 ? 1 : 0;
 }
@@ -276,13 +276,13 @@ int main(int argc, char **argv)
          exit(1);
        }
       repo = repo_create(pool, argv[optind]);
-      if (repo_add_solv(repo, stdin))
+      if (repo_add_solv(repo, stdin, 0))
        printf("could not read repository\n");
     }
   if (!pool->urepos)
     {
       repo = repo_create(pool, argc != 1 ? argv[1] : "<stdin>");
-      if (repo_add_solv(repo, stdin))
+      if (repo_add_solv(repo, stdin, 0))
        printf("could not read repository\n");
     }
   printf("pool contains %d strings, %d rels, string size is %d\n", pool->ss.nstrings, pool->nrels, pool->ss.sstrings);

diff --git a/tools/installcheck.c b/tools/installcheck.c
index 9658654..421c2b1 100644 (file)
--- a/tools/installcheck.c
+++ b/tools/installcheck.c
@@ -144,7 +144,7 @@ main(int argc, char **argv)
          repo_add_debpackages(repo, fp, 0);
        }
 #endif
-      else if (repo_add_solv(repo, fp))
+      else if (repo_add_solv(repo, fp, 0))
        {
          fprintf(stderr, "could not add repo %s\n", argv[i]);
          exit(1);

diff --git a/tools/mergesolv.c b/tools/mergesolv.c
index 653de47..0d6075c 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,7 @@ main(int argc, char **argv)
          perror(argv[optind]);
          exit(1);
        }
-      repo_add_solv(repo, fp);
+      repo_add_solv(repo, fp, 0);
       fclose(fp);
     }
   tool_write(repo, basefile, 0);

diff --git a/tools/patchcheck.c b/tools/patchcheck.c
index 6e3d82f..b0f4f2c 100644 (file)
--- a/tools/patchcheck.c
+++ b/tools/patchcheck.c
@@ -559,7 +559,7 @@ main(int argc, char **argv)
           repo_add_updateinfoxml(c.repo, fp, 0);
        }
 #endif
-      else if (repo_add_solv(c.repo, fp))
+      else if (repo_add_solv(c.repo, fp, 0))
         {
           fprintf(stderr, "could not add repo %s\n", argv[i]);
           exit(1);

diff --git a/tools/rpmdb2solv.c b/tools/rpmdb2solv.c
index 17895c8..33796ff 100644 (file)
--- a/tools/rpmdb2solv.c
+++ b/tools/rpmdb2solv.c
@@ -128,7 +128,7 @@ main(int argc, char **argv)
          else
            refpool = pool;
          ref = repo_create(refpool, "ref");
-         repo_add_solv(ref, fp);
+         repo_add_solv(ref, fp, 0);
          repo_disable_paging(ref);
          fclose(fp);
        }