From f6023f5673e09974b247444b41702a532a9da399 Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Fri, 25 Aug 2006 19:04:35 +0000
Subject: [PATCH] Fix a problem in the setup utility in which the user would be prompted about whether they wanted to create the base entry even if they said that they wanted to import from LDIF (presumably the LDIF being imported will contain the base entry).
---
opends/src/server/org/opends/server/tools/InstallDS.java | 5 +++--
1 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/opends/src/server/org/opends/server/tools/InstallDS.java b/opends/src/server/org/opends/server/tools/InstallDS.java
index 921e9bb..0367848 100644
--- a/opends/src/server/org/opends/server/tools/InstallDS.java
+++ b/opends/src/server/org/opends/server/tools/InstallDS.java
@@ -456,7 +456,7 @@
{
addBase = true;
- if (importLDIF.isPresent())
+ if ((ldifFiles != null) && (! ldifFiles.isEmpty()))
{
int msgID = MSGID_INSTALLDS_TWO_CONFLICTING_ARGUMENTS;
String message = getMessage(msgID, addBaseEntry.getLongIdentifier(),
@@ -465,7 +465,8 @@
return 1;
}
}
- else if (silentInstall.isPresent() || importLDIF.isPresent())
+ else if (silentInstall.isPresent() ||
+ ((ldifFiles != null) && (! ldifFiles.isEmpty())))
{
addBase = false;
}
--
Gitblit v1.10.0