From c980d65142ab7f2403443dffee4c612a2c305db1 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Mon, 17 Dec 2007 23:49:50 +0000 Subject: 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 --- ldap/admin/src/scripts/Util.pm.in | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'ldap/admin/src/scripts') 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; -- cgit