Merge pull request #8457 from adrianschroeter/update_marker

tag maintenance repositories
openSUSE · Sep 27, 2019 · a9b4cab · a9b4cab
2 parents 9519417 + d5f611e
commit a9b4cab
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/src/api/test/functional/maintenance_test.rb b/src/api/test/functional/maintenance_test.rb
@@ -1620,6 +1620,9 @@ def test_create_maintenance_project_and_release_packages
     IO.popen("cat #{ENV['OBS_BACKEND_TEMP']}/data/repos/BaseDistro2.0:/LinkedUpdateProject/BaseDistro2LinkedUpdateProject_repo/repodata/repomd.xml") do |io|
       hashed = Xmlhash.parse(io.read)
     end
+    # check repository markers
+    assert_equal hashed['tags']['content'], 'update'
+    assert_equal hashed['tags']['repo'].first, 'obsrepository://obstest/BaseDistro2.0:LinkedUpdateProject/BaseDistro2LinkedUpdateProject_repo'
     found = nil
     hashed['data'].each do |d|
       found = true if d['type'] == 'updateinfo'

diff --git a/src/backend/bs_publish b/src/backend/bs_publish
@@ -585,12 +585,15 @@ sub createrepo_rpmmd {
       $ENV{'CREATEREPO_CHECKSUMS'} = "$extrep/.chksums";
     }
   }
+  my $repoinfo = $data->{'repoinfo'};
   # create generic rpm-md meta data
   # --update requires a newer createrepo version, tested with version 0.4.10
   my @createrepoargs;
   push @createrepoargs, '--changelog-limit', '20';
   push @createrepoargs, map { ('--repo', $_ ) } @repotags;
   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';
   my @legacyargs;
   if ($options{'legacy'}) {
     push @legacyargs, '--simple-md-filenames', '--checksum=sha';
@@ -601,7 +604,6 @@ sub createrepo_rpmmd {
   if ($options{'zchunk'}) {
     # we currently do not support user generated zchunk dictionaries for
     # security reasons.
-    my $repoinfo = $data->{'repoinfo'};
     for my $sprp (@{$repoinfo->{'prpsearchpath'} || []}) {
       my $zchunk_dict_dir = "$BSConfig::bsdir/zchunk/$sprp->{'project'}";
       next unless -d $zchunk_dict_dir;