[api] report used devel or incident project on branching

FATE#318944
openSUSE · May 5, 2015 · 6ef6939 · 6ef6939
1 parent 4b0fb99
commit 6ef6939
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/src/api/app/helpers/branch_package.rb b/src/api/app/helpers/branch_package.rb
@@ -237,10 +237,12 @@ def report_dryrun
       @packages.each do |p|
         if p[:package].is_a? Package
           builder.package(:project => p[:link_target_project].name, :package => p[:package].name) do
+            builder.devel(:project => p[:copy_from_devel].project.name, :package => p[:copy_from_devel].name) if p[:copy_from_devel]
             builder.target(:project => @target_project, :package => p[:target_package])
           end
         else
           builder.package(:project => p[:link_target_project], :package => p[:package]) do
+            builder.devel(:project => p[:copy_from_devel].project.name, :package => p[:copy_from_devel].name) if p[:copy_from_devel]
             builder.target(:project => @target_project, :package => p[:target_package])
           end
         end

diff --git a/src/api/test/functional/maintenance_test.rb b/src/api/test/functional/maintenance_test.rb
@@ -1031,6 +1031,18 @@ def test_create_maintenance_project_and_release_packages
     get "/published/#{incidentProject}/BaseDistro2.0_LinkedUpdateProject/x86_64/package-1.0-1.x86_64.rpm"
     assert_response :success
 
+#https://api.opensuse.org/source?attribute=OBS%3AMaintained&cmd=branch&dryrun=1&update_project_attribute=OBS%3AUpdateProject&package=glibc
+
+    # A new branch would fetch sources from us already
+    post '/source', :cmd => 'branch', :dryrun => 1, :package => "pack2"
+    assert_response :success
+    assert_xml_tag( :parent => { :tag => "package", :attributes => {project: "BaseDistro2.0:LinkedUpdateProject", package: "pack2"} },
+                    :tag => 'devel',
+                    :attributes => { project: incidentProject, package: "pack2.BaseDistro2.0_LinkedUpdateProject" } )
+    assert_xml_tag( :parent => { :tag => "package", :attributes => {project: "BaseDistro3", package: "pack2"} },
+                    :tag => 'devel',
+                    :attributes => { project: incidentProject, package: "pack2.BaseDistro3" } )
+
     # create release request for real
     raw_post '/request?cmd=create&addrevision=1', '<request>
                                    <action type="maintenance_release">