diff options
| author | Noriko Hosoi <nhosoi@redhat.com> | 2010-06-18 14:24:05 -0700 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2010-06-23 12:13:28 -0600 |
| commit | 7094777b00a7310ce966fd9e237b9cab69c9329a (patch) | |
| tree | d6a1cdedd83522ad60b5d2ea219bcd9c03b93e4d | |
| parent | f70152942727368aa0ce378bdfd54c6bad32e69d (diff) | |
| download | ds-7094777b00a7310ce966fd9e237b9cab69c9329a.tar.gz ds-7094777b00a7310ce966fd9e237b9cab69c9329a.tar.xz ds-7094777b00a7310ce966fd9e237b9cab69c9329a.zip | |
605827 - In-place upgrade: upgrade dn format should not run in setup-ds-admin.pl
https://bugzilla.redhat.com/show_bug.cgi?id=605827
Description: 70upgradednformat.pl does nothing if the server is up.
The upgrade script is effective only when it's called in the Off-
line mode.
(cherry picked from commit a109da80a8eae4400b42a27bb5de604f9aee344d)
| -rw-r--r-- | ldap/admin/src/scripts/91upgradednformat.pl | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/ldap/admin/src/scripts/91upgradednformat.pl b/ldap/admin/src/scripts/91upgradednformat.pl index 1bed3cfd..611f1e0d 100644 --- a/ldap/admin/src/scripts/91upgradednformat.pl +++ b/ldap/admin/src/scripts/91upgradednformat.pl @@ -11,9 +11,16 @@ use File::Copy; # recursively copy the instance dir to the work dir (dnupgrade) # run upgradednformat w/o -N against the DB in the work dir # if it went ok, replace the original instance dir with the work dir. +# Note: This script does nothing if the server is up. sub runinst { my ($inf, $inst, $dseldif, $conn) = @_; + # First, check if the server is up or down. + if ($conn->isa("Mozilla::LDAP::Conn")) { + # The server is up, we do nothing. + return (); + } + my @errs; my $config = "cn=config"; |