summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2013-04-21 22:31:39 (EDT)
committerSteffen Pingel2013-04-21 22:31:39 (EDT)
commit81db1b68923db48643bf25c4cc75b9581938f429 (patch)
tree8648cff75a874e050d0941ee83ee1eaf93e09dca
parenta4275ac930f94ddaa2e75dc8dff860c51b43c775 (diff)
downloadorg.eclipse.mylyn.tasks-81db1b68923db48643bf25c4cc75b9581938f429.zip
org.eclipse.mylyn.tasks-81db1b68923db48643bf25c4cc75b9581938f429.tar.gz
org.eclipse.mylyn.tasks-81db1b68923db48643bf25c4cc75b9581938f429.tar.bz2
399803: update Bugzilla to 3.6.13 and suppress default valuesrefs/changes/88/12088/1
* fix disabling of Bugzilla instances * update to latest version from 3.6.x stream * only list property values that are not the default Change-Id: I8ba2a8f308365475492e6fb78a715da2f68fd25f Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=399803
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/manifests/default.pp4
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp2
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/templates/service.json.erb4
3 files changed, 5 insertions, 5 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp b/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp
index 2003d4b..1773447 100644
--- a/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/manifests/default.pp
@@ -22,8 +22,8 @@ user { "tools":
include "bugzilla"
exec { "disable all":
- command => "find $bugzilla::base -name \"service*.json\" | xargs -i mv {} {}.disabled",
- onlyif => "test -e $bugzilla::base",
+ command => "find $bugzilla::bugzillaBase -name \"service*.json\" | xargs -i mv {} {}.disabled",
+ onlyif => "test -e $bugzilla::bugzillaBase",
}
bugzilla::defaultsites { "bugzilla":
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 47b9021..d1bad0f 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/defaultsites.pp
@@ -23,7 +23,7 @@ define bugzilla::defaultsites($base = $bugzilla::bugzillaBase, $userOwner = $bug
/* Sites */
- bugzilla::site { "bugzilla-3.6.12":
+ bugzilla::site { "bugzilla-3.6.13":
major => "3",
minor => "6",
}
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 8fbbdc2..af588c8 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
@@ -4,10 +4,10 @@
"version": "<%= envversion %>",
"info": "<%= envinfo %>",
"properties":{
-<% if @envdefault %><% if propertyanz.to_i > 0 %> ,<% else %> <% end %><% propertyanz = propertyanz.to_i -%><% propertyanz += 1 -%>"default": "<%= envdefault %>"<% end %>
+<% 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 %>
}
}