[Fedora-directory-commits] adminserver/admserv/newinst/src AdminMigration.pm.in, 1.7, 1.8

[Richard Allen Megginson (rmeggins)]

Author: rmeggins

Update of /cvs/dirsec/adminserver/admserv/newinst/src
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv14172/adminserver/admserv/newinst/src

Modified Files:
	AdminMigration.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: AdminMigration.pm.in
===================================================================
RCS file: /cvs/dirsec/adminserver/admserv/newinst/src/AdminMigration.pm.in,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- AdminMigration.pm.in	7 Dec 2007 00:09:36 -0000	1.7
+++ AdminMigration.pm.in	17 Dec 2007 23:50:08 -0000	1.8
@@ -34,7 +34,7 @@
 use SetupLog;
 
 use File::Path;
-use File::Spec qw(file_name_is_absolute);
+use File::Spec;
 # tempfiles
 use File::Temp qw(tempfile tempdir);
 
@@ -485,7 +485,7 @@
     # if ldapStart is not an absolute path, we need to add
     # the directory server instance dir (ServerRoot) to it
     if ($mig->{inf}->{admin}->{ldapStart} &&
-        !file_name_is_absolute($mig->{inf}->{admin}->{ldapStart})) {
+        !File::Spec->file_name_is_absolute($mig->{inf}->{admin}->{ldapStart})) {
         debug(1, "Need to make ldapStart an absolute path - ", $mig->{ServerRoot}, "/",
               $mig->{inf}->{admin}->{ldapStart}, "\n");
         $mig->{inf}->{admin}->{ldapStart} = $mig->{ServerRoot} . "/" . $mig->{inf}->{admin}->{ldapStart};