From a33ae8f65570d219488ba1d0d46501c6a20d1fd5 Mon Sep 17 00:00:00 2001
From: jvergara <jvergara@localhost>
Date: Fri, 13 Jun 2008 11:13:08 +0000
Subject: [PATCH] Fix for issue 3355 (upgrade command should ask for confirmation) Ask for the confirmation and fix a typo in a comment.
---
opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractorCliHelper.java | 17 +++++++++++++++++
1 files changed, 17 insertions(+), 0 deletions(-)
diff --git a/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractorCliHelper.java b/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractorCliHelper.java
index 9fc8fff..634de07 100644
--- a/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractorCliHelper.java
+++ b/opends/src/quicksetup/org/opends/quicksetup/upgrader/BuildExtractorCliHelper.java
@@ -32,7 +32,9 @@
import org.opends.messages.Message;
+import org.opends.quicksetup.CliUserInteraction;
import org.opends.quicksetup.UserDataException;
+import org.opends.quicksetup.UserInteraction;
import org.opends.server.util.cli.CLIException;
import org.opends.server.util.cli.Menu;
import org.opends.server.util.cli.MenuBuilder;
@@ -142,6 +144,21 @@
CONFIRMATION_MAX_TRIES));
}
}
+ System.out.println();
+ Message cont = INFO_CONTINUE_BUTTON_LABEL.get();
+ Message cancel = INFO_CANCEL_BUTTON_LABEL.get();
+ UserInteraction ui = new CliUserInteraction();
+ if (cancel.equals(ui.confirm(
+ INFO_UPGRADE_CONFIRM_TITLE.get(),
+ INFO_UPGRADE_CONFIRM_PROMPT.get(
+ uud.getInstallPackage().getAbsolutePath()),
+ INFO_REVERT_CONFIRM_TITLE.get(),
+ UserInteraction.MessageType.WARNING,
+ new Message[] { cont, cancel },
+ cont))) {
+ LOG.log(Level.INFO, "User canceled upgrade.");
+ return null;
+ }
} else {
uud.setOperation(UpgradeUserData.Operation.REVERSION);
}
--
Gitblit v1.10.0