From 41cd7035e4a4fb164a8bd64d3b099ed0dc7693c9 Mon Sep 17 00:00:00 2001
From: Christophe Sovant <christophe.sovant@forgerock.com>
Date: Thu, 27 Jun 2013 13:39:03 +0000
Subject: [PATCH] Backport: Fixed for upgrade to 2.6.0
---
opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml | 25 ++++++++++++++++++++-----
1 files changed, 20 insertions(+), 5 deletions(-)
diff --git a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
index 67e80c3..6476298 100755
--- a/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
+++ b/opendj-sdk/opends/tests/staf-tests/shared/functions/dsadm.xml
@@ -297,11 +297,26 @@
'attribute' : 'TYPE'
}
</call>
- <if expr="RC != 48 and dsVersion == '2.6.0'">
- <!-- 'Legal/license_to_accept.txt' exists so add 'acceptLicense' option -->
- <script>
- STAFCmdParamsList.append('--acceptLicense')
- </script>
+ <if expr="RC != 48">
+ <!-- 'Legal/license_to_accept.txt' exists -->
+ <if expr="UPGRADE_OPENDJNAME != ''">
+ <!-- UPGRADE MODE -->
+ <if expr="UPGRADE_OPENDJNAME >= 'OpenDJ-2.5.0' and UPGRADE_OPENDJNAME != 'OpenDJ-2.5.0-Xpress1'">
+ <!--Upgrade from a version >= '2.5.0' so add 'acceptLicense' option -->
+ <script>
+ STAFCmdParamsList.append('--acceptLicense')
+ </script>
+ </if>
+ <else>
+ <!-- STANDARD MODE -->
+ <if expr="dsVersion >= '2.5.0' and dsVersion != '2.5.0-Xpress1'">
+ <!-- Install a fresh version >= '2.5.0' so add 'acceptLicense' option -->
+ <script>
+ STAFCmdParamsList.append('--acceptLicense')
+ </script>
+ </if>
+ </else>
+ </if>
</if>
<script>
--
Gitblit v1.10.0