summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Pingel2013-04-16 19:54:13 (EDT)
committer Steffen Pingel2013-04-16 19:56:54 (EDT)
commit98134ce70bb091dce62d2bc647401912818819d2 (patch)
treea7efac25c9cb49b9a0686991bfb12dacb0d053ed
parenta0fad711183c44b82edcb5df816856beaddf5079 (diff)
downloadorg.eclipse.mylyn.tasks-98134ce70bb091dce62d2bc647401912818819d2.zip
org.eclipse.mylyn.tasks-98134ce70bb091dce62d2bc647401912818819d2.tar.gz
org.eclipse.mylyn.tasks-98134ce70bb091dce62d2bc647401912818819d2.tar.bz2
400396: suppress default property unless setrefs/changes/60/11960/2
Change-Id: Id2b7fb22822b78fe2119f9eef17bef5c01ff0e66 Task-Url: https://bugs.eclipse.org/bugs/show_bug.cgi?id=400396
-rw-r--r--org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp2
-rw-r--r--org.eclipse.mylyn.trac.releng/modules/trac/manifests/service.pp2
-rw-r--r--org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp4
-rw-r--r--org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb4
4 files changed, 6 insertions, 6 deletions
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp
index b52b0e5..07de5e8 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/defaultsites.pp
@@ -77,7 +77,7 @@ define trac::defaultsites ($base = $trac::base, $userOwner = $trac::userOwner, $
trac::site { "trac-1.0.1":
version => "1.0.1",
require => Trac["1.0.1"],
- envdefault => 1,
+ envdefault => true,
}
trac::site { "trac-1.0-allbasic":
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/service.pp b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/service.pp
index e15a608..00a9b86 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/service.pp
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/service.pp
@@ -3,7 +3,7 @@ define trac::service (
$version,
$envtype = "trac",
$envinfo = "",
- $envdefault = 0,
+ $envdefault = false,
$envmode = "XML-RPC",
$accessmode = "XML_RPC",
$base = $trac::base,
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp
index 78fdd99..e6100ae 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/manifests/site.pp
@@ -10,7 +10,7 @@ define trac::site (
$base = $trac::base,
$envtype = "trac",
$envinfo = "",
- $envdefault = 0,
+ $envdefault = false,
$userOwner = $trac::userOwner,
$userGroup = $trac::userGroup,) {
$prefix = "$base/share/trac-$version"
@@ -168,7 +168,7 @@ define trac::site (
envid => "$title",
version => "$version",
envinfo => "$envinfo",
- envdefault => 0,
+ envdefault => false,
envmode => "Web",
accessmode => "TRAC_0_9",
}
diff --git a/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb b/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb
index 403818f..6abaa27 100644
--- a/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb
+++ b/org.eclipse.mylyn.trac.releng/modules/trac/templates/service.json.erb
@@ -15,8 +15,8 @@
<% end %>
],
"properties":{
-<% if @envdefault != 0 %>
- "default": "<%= envdefault %>",
+<% if @envdefault == true %>
+ "default": "1",
<% end %>
"version": "<%= accessmode %>"
}