repo: Remove write/read_solv functions that take paths

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>

diff --git a/src/_pakfire/repo.c b/src/_pakfire/repo.c
index 4d8b943702356d2d0f2ece5f563ed76d8a5234c6..431571b635992ce9d3b4c9e389ff349b84b240e9 100644 (file)
--- a/src/_pakfire/repo.c
+++ b/src/_pakfire/repo.c
@@ -249,36 +249,6 @@ static PyObject* Repo_get_config(RepoObject* self) {
        Py_RETURN_NONE;
 }
 
-static PyObject* Repo_read_solv(RepoObject* self, PyObject* args) {
-       const char* filename = NULL;
-
-       if (!PyArg_ParseTuple(args, "s", &filename))
-               return NULL;
-
-       int r = pakfire_repo_read_solv(self->repo, filename, 0);
-       if (r) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return NULL;
-       }
-
-       Py_RETURN_NONE;
-}
-
-static PyObject* Repo_write_solv(RepoObject* self, PyObject* args) {
-       const char* filename = NULL;
-
-       if (!PyArg_ParseTuple(args, "s", &filename))
-               return NULL;
-
-       int r = pakfire_repo_write_solv(self->repo, filename, 0);
-       if (r) {
-               PyErr_SetFromErrno(PyExc_OSError);
-               return NULL;
-       }
-
-       Py_RETURN_NONE;
-}
-
 static PyObject* Repo__add_package(RepoObject* self, PyObject* args) {
        const char* name;
        const char* evr;
@@ -393,12 +363,6 @@ static struct PyMethodDef Repo_methods[] = {
                METH_NOARGS,
                NULL,
        },
-       {
-               "read_solv",
-               (PyCFunction)Repo_read_solv,
-               METH_VARARGS,
-               NULL
-       },
        {
                "refresh",
                (PyCFunction)Repo_refresh,
@@ -411,12 +375,6 @@ static struct PyMethodDef Repo_methods[] = {
                METH_VARARGS,
                NULL
        },
-       {
-               "write_solv",
-               (PyCFunction)Repo_write_solv,
-               METH_VARARGS,
-               NULL
-       },
        {
                "_add_package",
                (PyCFunction)Repo__add_package,

diff --git a/src/libpakfire/include/pakfire/repo.h b/src/libpakfire/include/pakfire/repo.h
index 40ccb8e27cf32d9a79563b371a82a429e3448b36..60b4babf21fce4b979b73eff772942c175cd5fa7 100644 (file)
--- a/src/libpakfire/include/pakfire/repo.h
+++ b/src/libpakfire/include/pakfire/repo.h
@@ -68,11 +68,8 @@ char* pakfire_repo_get_config(struct pakfire_repo* repo);
 
 int pakfire_repo_is_installed_repo(struct pakfire_repo* repo);
 
-int pakfire_repo_read_solv(struct pakfire_repo* repo, const char* filename, int flags);
-int pakfire_repo_read_solv_fp(struct pakfire_repo* repo, FILE *f, int flags);
-
-int pakfire_repo_write_solv(struct pakfire_repo* repo, const char* filename, int flags);
-int pakfire_repo_write_solv_fp(struct pakfire_repo* repo, FILE *f, int flags);
+int pakfire_repo_read_solv(struct pakfire_repo* repo, FILE *f, int flags);
+int pakfire_repo_write_solv(struct pakfire_repo* repo, FILE *f, int flags);
 
 struct pakfire_package* pakfire_repo_add_archive(struct pakfire_repo* repo, struct pakfire_archive* archive);
 

diff --git a/src/libpakfire/libpakfire.sym b/src/libpakfire/libpakfire.sym
index bea7c2bd21e7afb54ef29b98e35569d90fa9c07f..146663f2f261f01bf2586ee52ade5b431e2dfb9f 100644 (file)
--- a/src/libpakfire/libpakfire.sym
+++ b/src/libpakfire/libpakfire.sym
@@ -251,7 +251,6 @@ global:
        pakfire_repo_identical;
        pakfire_repo_is_installed_repo;
        pakfire_repo_read_solv;
-       pakfire_repo_read_solv_fp;
        pakfire_repo_ref;
        pakfire_repo_refresh;
        pakfire_repo_scan;
@@ -262,7 +261,6 @@ global:
        pakfire_repo_set_mirrorlist_url;
        pakfire_repo_set_priority;
        pakfire_repo_write_solv;
-       pakfire_repo_write_solv_fp;
        pakfire_repo_unref;
 
        # repolist

diff --git a/src/libpakfire/repo.c b/src/libpakfire/repo.c
index 96d67344d30bab713a08b8cb90bab4eb0d916214..f594fa08b562277e54a8aa97278283bb1afd77f0 100644 (file)
--- a/src/libpakfire/repo.c
+++ b/src/libpakfire/repo.c
@@ -318,8 +318,14 @@ static int pakfire_repo_read_metadata(struct pakfire_repo* repo, const char* pat
                if (r)
                        goto ERROR;
 
+               // Open database file
+               FILE* f = fopen(database_cache_path, "r");
+               if (!f)
+                       goto ERROR;
+
                // Read database
-               r = pakfire_repo_read_solv(repo, database_cache_path, 0);
+               r = pakfire_repo_read_solv(repo, f, 0);
+               fclose(f);
                if (r) {
                        if (!refresh && errno == ENOENT)
                                goto NOERROR;
@@ -785,18 +791,7 @@ PAKFIRE_EXPORT int pakfire_repo_is_installed_repo(struct pakfire_repo* repo) {
        return r;
 }
 
-PAKFIRE_EXPORT int pakfire_repo_read_solv(struct pakfire_repo* repo, const char* filename, int flags) {
-       FILE* f = fopen(filename, "rb");
-       if (!f)
-               return 1;
-
-       int ret = pakfire_repo_read_solv_fp(repo, f, flags);
-       fclose(f);
-
-       return ret;
-}
-
-PAKFIRE_EXPORT int pakfire_repo_read_solv_fp(struct pakfire_repo* repo, FILE *f, int flags) {
+PAKFIRE_EXPORT int pakfire_repo_read_solv(struct pakfire_repo* repo, FILE *f, int flags) {
        f = pakfire_xfopen(f, "r");
        if (!f)
                return 1;
@@ -833,18 +828,7 @@ PAKFIRE_EXPORT int pakfire_repo_read_solv_fp(struct pakfire_repo* repo, FILE *f,
        return 0;
 }
 
-PAKFIRE_EXPORT int pakfire_repo_write_solv(struct pakfire_repo* repo, const char* filename, int flags) {
-       FILE* f = fopen(filename, "wb");
-       if (!f)
-               return 1;
-
-       int ret = pakfire_repo_write_solv_fp(repo, f, flags);
-       fclose(f);
-
-       return ret;
-}
-
-PAKFIRE_EXPORT int pakfire_repo_write_solv_fp(struct pakfire_repo* repo, FILE *f, int flags) {
+PAKFIRE_EXPORT int pakfire_repo_write_solv(struct pakfire_repo* repo, FILE *f, int flags) {
        pakfire_repo_internalize(repo);
 
        return repo_write(repo->repo, f);
@@ -1040,7 +1024,7 @@ static int pakfire_repo_write_database(struct pakfire_repo* repo, const char* pa
        }
 
        // Write the SOLV database to the temporary file
-       r = pakfire_repo_write_solv_fp(repo, f, 0);
+       r = pakfire_repo_write_solv(repo, f, 0);
        if (r) {
                ERROR(repo->pakfire, "Could not write SOLV data: %m\n");
                goto ERROR;