Merge pull request #5023 from bgeuken/bugfix/manual_maintenance_relea…

…se_project_wide

Bugfix/manual maintenance release project wide

.rubocop_todo.yml

@@ -204,7 +204,7 @@ Metrics/AbcSize:
 # Offense count: 486
 # Configuration parameters: CountComments, ExcludedMethods.
 Metrics/BlockLength:
-  Max: 493
+  Max: 505
 
 # Offense count: 24
 # Configuration parameters: CountBlocks.

src/api/app/models/binary_release.rb

@@ -85,7 +85,6 @@ def self.update_binary_releases_via_json(repository, json, time = Time.now)
           rescue ActiveXML::Transport::NotFoundError
             # patchinfo disappeared meanwhile
           end
-          # no database object on purpose, since it must also work for historic releases...
           hash[:binary_maintainer] = patchinfo.to_hash['packager'] if patchinfo && patchinfo.to_hash['packager']
         end
 

src/api/app/models/package.rb

@@ -1400,6 +1400,11 @@ def send_sysrq(params)
     backend_build_command(:sendsysrq, params[:project], params.slice(:package, :arch, :repository, :sysrq))
   end
 
+  def target_name
+    # The maintenance ID is always the sub project name of the maintenance project
+    project.is_maintenance_incident? ? "#{name}.#{project.basename}" : name
+  end
+
   def release_target_name
     # usually used in maintenance incidents
     return releasename if releasename

src/api/app/models/project.rb

@@ -7,6 +7,7 @@ class Project < ApplicationRecord
   include HasRelationships
   include HasRatings
   include HasAttributes
+  include MaintenanceHelper
 
   class CycleError < APIException
     setup 'project_cycle'
@@ -696,6 +697,10 @@ def possible_ancestor_names
     possible_projects
   end
 
+  def basename
+    name.gsub(/.*:/, '')
+  end
+
   def to_axml(_opts = {})
     Rails.cache.fetch("xml_project_#{id}") do
       # CanRenderModel
@@ -1223,7 +1228,7 @@ def do_project_release(params)
           next if params[:targetreposiory] && params[:targetreposiory] != releasetarget.target_repository.name
           # release source and binaries
           # permission checking happens inside this function
-          release_package(pkg, releasetarget.target_repository, pkg.name, repo, nil, nil, params[:setrelease], true)
+          release_package(pkg, releasetarget.target_repository, pkg.target_name, repo, nil, nil, params[:setrelease], true)
         end
       end
     end