Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrank Becker2012-11-09 04:39:32 +0000
committerFrank Becker2012-11-09 04:39:32 +0000
commit7cab6be23cfccef1ac9048ff92c002e3dc39eace (patch)
treecdac35c13636296c59adf7e1ae50b0313d401972 /org.eclipse.mylyn.bugzilla.releng/modules
parent69ad377197e2f5685f28a2554758e1efe38c8d01 (diff)
downloadorg.eclipse.mylyn.tasks-7cab6be23cfccef1ac9048ff92c002e3dc39eace.tar.gz
org.eclipse.mylyn.tasks-7cab6be23cfccef1ac9048ff92c002e3dc39eace.tar.xz
org.eclipse.mylyn.tasks-7cab6be23cfccef1ac9048ff92c002e3dc39eace.zip
393640: fix errors
Diffstat (limited to 'org.eclipse.mylyn.bugzilla.releng/modules')
-rw-r--r--org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp15
1 files changed, 11 insertions, 4 deletions
diff --git a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
index e27d06f1a..b081a96e0 100644
--- a/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
+++ b/org.eclipse.mylyn.bugzilla.releng/modules/bugzilla/manifests/init.pp
@@ -1,11 +1,12 @@
define bugzillaVersion (
$major,
$minor,
+ $branch = " ",
+ $bugz_dbname = "$title",
+
$www_url = "$title",
$version = "$title",
- $branch = "${::major}.${::minor}",
$branchTag = "bugzilla-stable",
- $bugz_dbname = "bugs_${::major}_${::minor}",
$custom_wf = false,
$custom_wf_and_status = false,
$xmlrpc_enabled = true,
@@ -20,17 +21,23 @@ define bugzillaVersion (
} else {
$VersionCreateName = "value"
}
+
+ if ($branch == "trunk") {
+ $branchName = "$branch"
+ } else {
+ $branchName = "${major}.${minor}"
+ }
if $branchTag == "trunk" {
exec { "extract bugzilla $version":
- command => "bzr co bzr://bzr.mozilla.org/bugzilla/$branch $version",
+ command => "bzr co bzr://bzr.mozilla.org/bugzilla/$branchName $version",
cwd => "$base",
timeout => 300,
creates => "$base/$version",
}
} else {
exec { "extract bugzilla $version":
- command => "bzr co -r tag:$branchTag bzr://bzr.mozilla.org/bugzilla/$branch $version",
+ command => "bzr co -r tag:$branchTag bzr://bzr.mozilla.org/bugzilla/$branchName $version",
cwd => "$base",
timeout => 300,
creates => "$base/$version",

Back to the top