diff options
author | Frank Becker | 2013-05-01 15:25:33 +0000 |
---|---|---|
committer | Gerrit Code Review @ Eclipse.org | 2013-05-09 12:59:07 +0000 |
commit | 20e8aaf07ff15718cd47180630614e240b687a83 (patch) | |
tree | 66eac10b68a4c8ebcc1df83bf3e8e38036b3f822 /org.eclipse.mylyn.bugzilla.releng | |
parent | ec1c6c9dfe7c3c63c0a55e0b278c57695772eef7 (diff) | |
download | org.eclipse.mylyn.tasks-20e8aaf07ff15718cd47180630614e240b687a83.tar.gz org.eclipse.mylyn.tasks-20e8aaf07ff15718cd47180630614e240b687a83.tar.xz org.eclipse.mylyn.tasks-20e8aaf07ff15718cd47180630614e240b687a83.zip |
398239: Bugzilla should return RepositoryStatus (ERROR_INTERNAL) on
invalid taskID in getMultiTaskData
Change-Id: Ia31e03314e1a43d3f22596f3dd7d8ff96d8c6ed2
Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=398239
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng')
4 files changed, 13 insertions, 1 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp index 1cc29f3b2..55ad949e0 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp @@ -62,6 +62,13 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug envdefault => true, } + bugzilla::site { "bugzilla-4.2.5-bugaliases": + major => "4", + minor => "2", + branchTag => "bugzilla-4.2.5", + usebugaliases => true, + } + bugzilla::site { "bugzilla-4.4": major => "4", minor => "4", diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp index 980895962..a97c3d06f 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/site.pp @@ -31,6 +31,7 @@ define bugzilla::site ( $envdefault = false, $clearDB = $bugzilla::clearDB, $desciptorfile = " ", + $usebugaliases = false, ) { include "bugzilla" @@ -44,6 +45,8 @@ define bugzilla::site ( $envinfo1 = "Custom Workflow" } elsif $custom_wf_and_status { $envinfo1 = "Custom Workflow and Status" + } elsif $usebugaliases { + $envinfo1 = "Use Bugaliases" } else { $envinfo1 = "" } diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb index 2022724ca..bc75ee3d5 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/answers.erb @@ -16,4 +16,5 @@ $answer{'mail_delivery_method'} = 'None'; $answer{'insidergroup'} = 'bz_canusewhineatothers'; <% if @custom_wf_and_status %>$answer{'duplicate_or_move_bug_status'} = 'CLOSED';<% end %> +<% if @usebugaliases %>$answer{'usebugaliases'} = '1';<% end %> $answer{'NO_PAUSE'} = 1 diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb index af588c874..920c5a55d 100644 --- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb +++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb @@ -7,7 +7,8 @@ <% if @envdefault %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"default": "1"<% end %> <% if @custom_wf %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"custom_wf": "<%= custom_wf %>"<% end %> <% if @custom_wf_and_status %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"custom_wf_and_status": "<%= custom_wf_and_status %>"<% end %> -<% if !@xmlrpc_enabled %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"xmlrpc_enabled": "<%= xmlrpc_enabled %>"<% end %> +<% if !@xmlrpc_enabled %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"xmlrpc_enabled": "<%= xmlrpc_enabled %>"<% end %> <% if @desciptorfile > " " %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"desciptorfile": "<%= desciptorfile %>"<% end %> +<% if @usebugaliases %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"usebugaliases": "<%= usebugaliases %>"<% end %> } } |