[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts Util.pm.in, 1.15, 1.16

[Doctor Conrad]

Author: rmeggins

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory
cvs-int.fedora.redhat.com:/tmp/cvs-serv14146/ldapserver/ldap/admin/src/scripts

Modified Files:
	Util.pm.in 
Log Message:
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



Index: Util.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Util.pm.in,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- Util.pm.in	14 Dec 2007 17:22:59 -0000	1.15
+++ Util.pm.in	17 Dec 2007 23:49:50 -0000	1.16
@@ -842,7 +842,9 @@
 
     $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;