From c8e2bfb1af30a5ec7f155e0aee45551d1ad8699a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Adrian=20Schr=C3=B6ter?= Date: Fri, 30 Mar 2012 15:43:11 +0200 Subject: [PATCH] [api] avoid to copy from same incident if a mainteannce_request tries to update the package --- src/api/app/helpers/maintenance_helper.rb | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/api/app/helpers/maintenance_helper.rb b/src/api/app/helpers/maintenance_helper.rb index f38157d53a2..cf704b45573 100644 --- a/src/api/app/helpers/maintenance_helper.rb +++ b/src/api/app/helpers/maintenance_helper.rb @@ -611,8 +611,10 @@ def do_branch params end end if incident_pkg - p[:copy_from_devel] = incident_pkg - logger.info "sources will get copied from incident package #{p[:copy_from_devel].db_project.name}/#{p[:copy_from_devel].name}" + unless incident_pkg.db_project == mp + p[:copy_from_devel] = incident_pkg + logger.info "sources will get copied from incident package #{p[:copy_from_devel].db_project.name}/#{p[:copy_from_devel].name}" + end end elsif not copy_from_devel and p[:package].class == DbPackage and ( p[:package].develproject or p[:package].develpackage or p[:package].db_project.develproject ) p[:package] = p[:package].resolve_devel_package