From 3d8214539ebc6afc6f948f60a8010d3de8c31a0d Mon Sep 17 00:00:00 2001
From: kenneth_suter <kenneth_suter@localhost>
Date: Fri, 08 Jun 2007 19:15:27 +0000
Subject: [PATCH] This commit address several related issues regarding the upgrader CLI:

---
 opendj-sdk/opends/resource/upgrade.bat |   12 +++---------
 1 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/opendj-sdk/opends/resource/upgrade.bat b/opendj-sdk/opends/resource/upgrade.bat
index 1d1a7a8..7b3591c 100644
--- a/opendj-sdk/opends/resource/upgrade.bat
+++ b/opendj-sdk/opends/resource/upgrade.bat
@@ -69,18 +69,12 @@
 set CLASSPATH=""
 FOR %%x in ("%INSTANCE_ROOT%\lib\*.jar") DO call "%INSTANCE_ROOT%\lib\setcp.bat" %%x
 "%JAVA_BIN%" org.opends.quicksetup.upgrader.BuildExtractor %*
-goto prepUpgrader
+if not %errorlevel% == 0 goto end
+goto upgrader
 
-:prepUpgrader
-if EXIST "%INSTANCE_ROOT%\tmp\upgrade" goto setClassPathToStageDir
-goto callUpgrader
-
-:setClassPathToStageDir
+:upgrader
 set CLASSPATH=""
 FOR %%x in ("%INSTANCE_ROOT%\tmp\upgrade\lib\*.jar") DO call "%INSTANCE_ROOT%\lib\setcp.bat" %%x
-goto callUpgrader
-
-:callUpgrader
 "%JAVA_BIN%" org.opends.quicksetup.upgrader.UpgradeLauncher %*
 goto end
 

--
Gitblit v1.10.0