diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2007-12-17 23:49:50 +0000 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2007-12-17 23:49:50 +0000 |
| commit | c980d65142ab7f2403443dffee4c612a2c305db1 (patch) | |
| tree | 6794a2f3207dadf72bec6c1fca70accf414a22ef /ldap/admin | |
| parent | d396eab31583fd8f32484cd55f0c394133afb32b (diff) | |
| download | ds-c980d65142ab7f2403443dffee4c612a2c305db1.tar.gz ds-c980d65142ab7f2403443dffee4c612a2c305db1.tar.xz ds-c980d65142ab7f2403443dffee4c612a2c305db1.zip | |
Resolves: bug 425849
Bug Description: migrate-ds-admin.pl spins at 100% cpu
Reviewed by: nkinder (Thanks!)
Fix Description: It was spinning because inst_dir was not being set, so it kept trying to find the parent directory of a non-existent directory. In migration, the old instance has no instance dir - we will fill that in during instance creation, so just skip it if not set. I also found and fixed another bug in migration with the usage of file_name_is_absolute - have to use the full module name and function name.
Platforms tested: RHEL4 32bit and 64bit
Flag Day: no
Doc impact: no
QA impact: should be covered by regular nightly and manual testing
New Tests integrated into TET: none
Diffstat (limited to 'ldap/admin')
| -rw-r--r-- | ldap/admin/src/scripts/Util.pm.in | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/ldap/admin/src/scripts/Util.pm.in b/ldap/admin/src/scripts/Util.pm.in index f7b0d6e8..80f7bd97 100644 --- a/ldap/admin/src/scripts/Util.pm.in +++ b/ldap/admin/src/scripts/Util.pm.in @@ -842,7 +842,9 @@ sub createInfFromConfig { $conn->close(); - print $outfh "inst_dir = $inst_dir\n"; + if ($inst_dir) { + print $outfh "inst_dir = $inst_dir\n"; + } print $outfh "Suffix = $suffix\n"; close $outfh; |