locate_metadata: cr_locate_metadata() now takes gboolean instead of int

diff --git a/src/createrepo_c.c b/src/createrepo_c.c
index c6e0dee..4749d7f 100644 (file)
--- a/src/createrepo_c.c
+++ b/src/createrepo_c.c
@@ -417,8 +417,7 @@ main(int argc, char **argv)
     }
 
     // Check if lock exists & Create lock dir
-    ret = cr_lock_repo(out_dir, cmd_options->ignore_lock, &lock_dir, &tmp_out_repo, &tmp_err);
-    if (!ret) {
+    if (!cr_lock_repo(out_dir, cmd_options->ignore_lock, &lock_dir, &tmp_out_repo, &tmp_err)) {
         g_printerr("%s\n", tmp_err->message);
         exit(EXIT_FAILURE);
     }
@@ -493,9 +492,9 @@ main(int argc, char **argv)
         cr_metadata_set_dupaction(old_metadata, CR_HT_DUPACT_REMOVEALL);
 
         if (cmd_options->outputdir)
-            old_metadata_location = cr_locate_metadata(out_dir, 1, NULL);
+            old_metadata_location = cr_locate_metadata(out_dir, TRUE, NULL);
         else
-            old_metadata_location = cr_locate_metadata(in_dir, 1, NULL);
+            old_metadata_location = cr_locate_metadata(in_dir, TRUE, NULL);
 
         if (old_metadata_location) {
             ret = cr_metadata_load_xml(old_metadata,

diff --git a/src/load_metadata.c b/src/load_metadata.c
index 0842d22..e5673bd 100644 (file)
--- a/src/load_metadata.c
+++ b/src/load_metadata.c
@@ -565,7 +565,7 @@ cr_metadata_locate_and_load_xml(cr_Metadata *md,
     assert(md);
     assert(repopath);
 
-    ml = cr_locate_metadata(repopath, 1, &tmp_err);
+    ml = cr_locate_metadata(repopath, TRUE, &tmp_err);
     if (!ml) {
         int code = tmp_err->code;
         g_propagate_error(err, tmp_err);

diff --git a/src/locate_metadata.c b/src/locate_metadata.c
index 9b8a4c3..ded0e92 100644 (file)
--- a/src/locate_metadata.c
+++ b/src/locate_metadata.c
@@ -126,7 +126,7 @@ cr_parse_repomd(const char *repomd_path,
 }
 
 static struct cr_MetadataLocation *
-cr_get_local_metadata(const char *repopath, int ignore_sqlite)
+cr_get_local_metadata(const char *repopath, gboolean ignore_sqlite)
 {
     _cleanup_free_ gchar *repomd = NULL;
     struct cr_MetadataLocation *ret = NULL;
@@ -153,7 +153,7 @@ cr_get_local_metadata(const char *repopath, int ignore_sqlite)
 
 
 static struct cr_MetadataLocation *
-cr_get_remote_metadata(const char *repopath, int ignore_sqlite)
+cr_get_remote_metadata(const char *repopath, gboolean ignore_sqlite)
 {
     CURL *handle = NULL;
     _cleanup_free_ gchar *tmp_dir = NULL;
@@ -275,7 +275,7 @@ get_remote_metadata_cleanup:
 
 // XXX: err is not really used in this function yet
 struct cr_MetadataLocation *
-cr_locate_metadata(const char *repopath, int ignore_sqlite, GError **err)
+cr_locate_metadata(const char *repopath, gboolean ignore_sqlite, GError **err)
 {
     struct cr_MetadataLocation *ret = NULL;
 

diff --git a/src/locate_metadata.h b/src/locate_metadata.h
index c7c9bfe..d9822ca 100644 (file)
--- a/src/locate_metadata.h
+++ b/src/locate_metadata.h
@@ -62,7 +62,7 @@ struct cr_MetadataLocation {
  * @return              filled cr_MetadataLocation structure or NULL
  */
 struct cr_MetadataLocation *cr_locate_metadata(const char *repopath,
-                                               int ignore_sqlite,
+                                               gboolean ignore_sqlite,
                                                GError **err);
 
 /** Free cr_MetadataLocation. If repodata were downloaded remove

diff --git a/src/mergerepo_c.c b/src/mergerepo_c.c
index 4b40fd4..88946ac 100644 (file)
--- a/src/mergerepo_c.c
+++ b/src/mergerepo_c.c
@@ -1602,7 +1602,7 @@ main(int argc, char **argv)
     gboolean cr_download_failed = FALSE;
 
     for (element = cmd_options->repo_list; element; element = g_slist_next(element)) {
-        struct cr_MetadataLocation *loc = cr_locate_metadata((gchar *) element->data, 1, NULL);
+        struct cr_MetadataLocation *loc = cr_locate_metadata((gchar *) element->data, TRUE, NULL);
         if (!loc) {
             g_warning("Downloading of repodata failed: %s", (gchar *) element->data);
             cr_download_failed = TRUE;
@@ -1660,7 +1660,7 @@ main(int argc, char **argv)
     if (cmd_options->noarch_repo_url) {
         struct cr_MetadataLocation *noarch_ml;
 
-        noarch_ml = cr_locate_metadata(cmd_options->noarch_repo_url, 1, NULL);
+        noarch_ml = cr_locate_metadata(cmd_options->noarch_repo_url, TRUE, NULL);
         if (!noarch_ml) {
             g_critical("Cannot locate noarch repo: %s", cmd_options->noarch_repo_url);
             return 1;

diff --git a/src/python/locate_metadata-py.c b/src/python/locate_metadata-py.c
index 607f6b1..daa0c05 100644 (file)
--- a/src/python/locate_metadata-py.c
+++ b/src/python/locate_metadata-py.c
@@ -78,10 +78,10 @@ metadatalocation_init(_MetadataLocationObject *self, PyObject *args, PyObject *k
 {
     CR_UNUSED(kwds);
     char *repopath;
-    int ignore_db;
+    PyObject *py_ignore_db = NULL;
     GError *tmp_err = NULL;
 
-    if (!PyArg_ParseTuple(args, "si|:metadatalocation_init", &repopath, &ignore_db))
+    if (!PyArg_ParseTuple(args, "sO|:metadatalocation_init", &repopath, &py_ignore_db))
         return -1;
 
     /* Free all previous resources when reinitialization */
@@ -90,7 +90,7 @@ metadatalocation_init(_MetadataLocationObject *self, PyObject *args, PyObject *k
     }
 
     /* Init */
-    self->ml = cr_locate_metadata(repopath, ignore_db, &tmp_err);
+    self->ml = cr_locate_metadata(repopath, PyObject_IsTrue(py_ignore_db), &tmp_err);
     if (tmp_err) {
         nice_exception(&tmp_err, NULL);
         return -1;