From e70eef6ab4301f0ecbcc1e1c81232b6e3000cbdd Mon Sep 17 00:00:00 2001 From: Tomas Mlcoch Date: Tue, 17 Apr 2012 16:31:47 +0200 Subject: [PATCH] Fix check of return value from load_metadata. --- src/createrepo_c.c | 8 ++++---- src/mergerepo_c.c | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/createrepo_c.c b/src/createrepo_c.c index c9c3588..6a30bb1 100644 --- a/src/createrepo_c.c +++ b/src/createrepo_c.c @@ -337,10 +337,10 @@ int main(int argc, char **argv) { // Load local repodata old_metadata = new_metadata_hashtable(); int ret = locate_and_load_xml_metadata(old_metadata, in_dir, HT_KEY_FILENAME); - if (!ret) { - g_warning("Old metadata from %s - loading failed", in_dir); - } else { + if (ret == LOAD_METADATA_OK) { g_debug("Old metadata from: %s - loaded", in_dir); + } else { + g_warning("Old metadata from %s - loading failed", in_dir); } // Load repodata from --update-md-path @@ -349,7 +349,7 @@ int main(int argc, char **argv) { char *path = (char *) element->data; g_message("Loading metadata from: %s", path); int ret = locate_and_load_xml_metadata(old_metadata, path, HT_KEY_FILENAME); - if (ret) { + if (ret == LOAD_METADATA_OK) { g_debug("Old metadata from md-path %s - loaded", path); } else { g_warning("Old metadata from md-path %s - loading failed", path); diff --git a/src/mergerepo_c.c b/src/mergerepo_c.c index 66e6844..3933b99 100644 --- a/src/mergerepo_c.c +++ b/src/mergerepo_c.c @@ -307,7 +307,7 @@ long merge_repos(GHashTable *merged, struct CmdOptions *cmd_options) { repopath = (gchar *) element->data; g_debug("Processing: %s", repopath); - if (locate_and_load_xml_metadata(tmp_hashtable, repopath, HT_KEY_HASH) == 0) { + if (locate_and_load_xml_metadata(tmp_hashtable, repopath, HT_KEY_HASH) == LOAD_METADATA_ERR) { g_critical("Cannot load repo: \"%s\"", repopath); destroy_metadata_hashtable(tmp_hashtable); break; -- 2.7.4