Merge pull request #12453 from adrianschroeter/fix_rpmmd_metadata

[backend] fix broken additional metadata with createrepo_c 0.20
openSUSE · Apr 19, 2022 · 60b2fac · 60b2fac
2 parents 7a7dac8 + 2289bff
commit 60b2fac
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 1 deletion.
diff --git a/dist/obs-server.spec b/dist/obs-server.spec
@@ -172,7 +172,7 @@ Requires:       perl(Date::Parse)
 Requires:       diffutils
 PreReq:         git-core
 Requires:       patch
-Requires:       createrepo_c
+Requires:       createrepo_c >= 0.20
 Recommends:     cron logrotate
 # zsync for appimage signing
 Recommends:     zsync

diff --git a/src/backend/bs_publish b/src/backend/bs_publish
@@ -617,6 +617,9 @@ sub createrepo_rpmmd {
   push @createrepoargs, '--content', 'debug' if $data->{'dbgsplit'};
   push @createrepoargs, '--content', 'update' if ($repoinfo->{'projectkind'} || '') eq 'maintenance_incident';
   push @createrepoargs, '--content', 'update' if ($repoinfo->{'projectkind'} || '') eq 'maintenance_release';
+  # createrepo_c 0.20.0 defaults to keep always additional metadata. We must change
+  # to old behaviour or old data would stay forever when it got removed actually
+  push @createrepoargs, '--discard-additional-metadata';
   my @legacyargs;
   if ($options{'legacy'}) {
     push @legacyargs, '--simple-md-filenames', '--checksum=sha';