- change transaction_init to transaction_create, add solver flag setting/getting

[platform/upstream/libsolv.git] / ext / repo_releasefile_products.c

diff --git a/ext/repo_releasefile_products.c b/ext/repo_releasefile_products.c
index d7352af..7a7c217 100644 (file)
--- a/ext/repo_releasefile_products.c
+++ b/ext/repo_releasefile_products.c
@@ -66,7 +66,7 @@ add_releasefile_product(Repo *repo, FILE *fp)
                 && (*ptr1 == ' ' || isdigit(*ptr1) || *ptr1 == '.'))
            --ptr1;
          *(++ptr1) = 0;
-         name = str2id(pool, join2("product", ":", buf), 1);
+         name = pool_str2id(pool, join2("product", ":", buf), 1);
 
          if (ptr)
            {
@@ -83,7 +83,7 @@ add_releasefile_product(Repo *repo, FILE *fp)
                         *ptr1 = tolower(*ptr1);
                      ++ptr1;
                    }
-                 arch = str2id(pool, ptr, 1);
+                 arch = pool_str2id(pool, ptr, 1);
                }
            }
        }
@@ -105,12 +105,12 @@ add_releasefile_product(Repo *repo, FILE *fp)
       s->evr = version ? version : ID_EMPTY;
       s->arch = arch ? arch : ARCH_NOARCH;
       if (s->name && s->arch != ARCH_SRC && s->arch != ARCH_NOSRC)
-       s->provides = repo_addid_dep(repo, s->provides, rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
+       s->provides = repo_addid_dep(repo, s->provides, pool_rel2id(pool, s->name, s->evr, REL_EQ, 1), 0);
     }
 }
 
 
-void
+int
 repo_add_releasefile_products(Repo *repo, const char *dirpath, int flags)
 {
   DIR *dir;
@@ -120,7 +120,7 @@ repo_add_releasefile_products(Repo *repo, const char *dirpath, int flags)
 
   dir = opendir(dirpath);
   if (!dir)
-    return;
+    return 0;
 
   while ((entry = readdir(dir)))
     {
@@ -145,5 +145,6 @@ repo_add_releasefile_products(Repo *repo, const char *dirpath, int flags)
 
   if (!(flags & REPO_NO_INTERNALIZE) && (flags & REPO_REUSE_REPODATA) != 0)
     repodata_internalize(repo_last_repodata(repo));
+  return 0;
 }