Skip to content

Commit

Permalink
[api] avoid to copy from same incident if a mainteannce_request tries…
Browse files Browse the repository at this point in the history
… to update the package
  • Loading branch information
adrianschroeter committed Mar 30, 2012
1 parent 5d4f76b commit 2b57de0
Showing 1 changed file with 4 additions and 2 deletions.
6 changes: 4 additions & 2 deletions src/api/app/helpers/maintenance_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -610,8 +610,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
Expand Down

0 comments on commit 2b57de0

Please sign in to comment.