From c4a37388464521fa7a3c005eb2ab7300efa00675 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ale=C5=A1=20Mat=C4=9Bj?= Date: Tue, 5 Oct 2021 09:26:49 +0200 Subject: Set database version only for the database records, not everything This was causing mismatches when comparing repomds, because the database version is dumped only for the database records. So old loaded records didn't have it but the new generated ones did even though it wouldn't be written to an repomd xml later. --- src/createrepo_c.c | 6 ++++++ src/repomd.c | 6 ------ tests/python/tests/test_repomdrecord.py | 4 ++-- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/createrepo_c.c b/src/createrepo_c.c index b96588c..202ff0d 100644 --- a/src/createrepo_c.c +++ b/src/createrepo_c.c @@ -56,6 +56,7 @@ #endif /* WITH_LIBMODULEMD */ #define OUTDELTADIR "drpms/" +#define DEFAULT_DATABASE_VERSION 10 /** Check if the filename is excluded by any exclude mask. * @param filename Filename (basename). @@ -1612,6 +1613,11 @@ main(int argc, char **argv) fil_db_rec = cr_repomd_record_new("filelists_db", fil_db_name); oth_db_rec = cr_repomd_record_new("other_db", oth_db_name); + // Set db version + pri_db_rec->db_ver = DEFAULT_DATABASE_VERSION; + fil_db_rec->db_ver = DEFAULT_DATABASE_VERSION; + oth_db_rec->db_ver = DEFAULT_DATABASE_VERSION; + g_free(pri_db_name); g_free(fil_db_name); g_free(oth_db_name); diff --git a/src/repomd.c b/src/repomd.c index f68f77e..a5bb07a 100644 --- a/src/repomd.c +++ b/src/repomd.c @@ -38,7 +38,6 @@ #define ERR_DOMAIN CREATEREPO_C_ERROR #define LOCATION_HREF_PREFIX "repodata/" -#define DEFAULT_DATABASE_VERSION 10 #define BUFFER_SIZE 8192 cr_DistroTag * @@ -330,11 +329,6 @@ cr_repomd_record_fill(cr_RepomdRecord *md, } } - // Set db version - - if (!md->db_ver) - md->db_ver = DEFAULT_DATABASE_VERSION; - return CRE_OK; } diff --git a/tests/python/tests/test_repomdrecord.py b/tests/python/tests/test_repomdrecord.py index 58f21cc..7d4cb13 100644 --- a/tests/python/tests/test_repomdrecord.py +++ b/tests/python/tests/test_repomdrecord.py @@ -102,7 +102,7 @@ class TestCaseRepomdRecord(unittest.TestCase): self.assertEqual(zrc.size, 269) self.assertEqual(zrc.size_open, 167) self.assertEqual(zrc.size_header, 132) - self.assertEqual(zrc.db_ver, 10) + self.assertEqual(zrc.db_ver, 0) zrc.rename_file() @@ -132,7 +132,7 @@ class TestCaseRepomdRecord(unittest.TestCase): self.assertTrue(rec.timestamp > 0) self.assertEqual(rec.size, 134) self.assertEqual(rec.size_open, 167) - self.assertEqual(rec.db_ver, 10) + self.assertEqual(rec.db_ver, 0) # Set new values -- cgit v1.2.3