Skip to content

Commit

Permalink
[api] better fix for double copy
Browse files Browse the repository at this point in the history
  • Loading branch information
adrianschroeter committed Mar 30, 2012
1 parent 2b57de0 commit 926cbe5
Showing 1 changed file with 3 additions and 5 deletions.
8 changes: 3 additions & 5 deletions src/api/app/helpers/maintenance_helper.rb
Original file line number Diff line number Diff line change
Expand Up @@ -610,10 +610,8 @@ def do_branch params
end
end
if incident_pkg
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
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
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 Expand Up @@ -885,7 +883,7 @@ def do_branch params
end

# fetch newer sources from devel package, if defined
if p[:copy_from_devel]
if p[:copy_from_devel] and p[:copy_from_devel].db_project != tpkg.db_project
msg="fetch+updates+from+devel+package+#{CGI.escape(p[:copy_from_devel].db_project.name)}/#{CGI.escape(p[:copy_from_devel].name)}"
msg="fetch+updates+from+open+incident+project+#{CGI.escape(p[:copy_from_devel].db_project.name)}" if p[:copy_from_devel].db_project.project_type == "maintenance_incident"
answer = Suse::Backend.post "/source/#{tpkg.db_project.name}/#{tpkg.name}?cmd=copy&keeplink=1&expand=1&oproject=#{CGI.escape(p[:copy_from_devel].db_project.name)}&opackage=#{CGI.escape(p[:copy_from_devel].name)}&user=#{CGI.escape(@http_user.login)}&comment=#{msg}", nil
Expand Down

0 comments on commit 926cbe5

Please sign in to comment.