[Fedora-directory-commits] ldapserver/ldap/admin/src/scripts Migration.pm.in, 1.9, 1.10

[Noriko Hosoi]

Author: nhosoi

Update of /cvs/dirsec/ldapserver/ldap/admin/src/scripts
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv24287

Modified Files:
	Migration.pm.in 
Log Message:
Resolves: #489360
Summary: Replication Bind Failure After Migration from DS 7.1 (comment #10)
Description: changed to trim trailing slashes of oldsroot and actualsroot at the beginning.



Index: Migration.pm.in
===================================================================
RCS file: /cvs/dirsec/ldapserver/ldap/admin/src/scripts/Migration.pm.in,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Migration.pm.in	24 Feb 2009 16:57:45 -0000	1.9
+++ Migration.pm.in	24 Mar 2009 22:50:20 -0000	1.10
@@ -205,7 +205,9 @@
     my $oldpkgname = "@brand at -ds";
 
     $self->{pkgname} = $pkgname;
+    $oldsroot =~ s/\/+$//; # trim trailing '/'s, if any
     $self->{oldsroot} = $oldsroot || "/opt/$oldpkgname";
+    $actualsroot =~ s/\/+$//; # trim trailing '/'s, if any
     $self->{actualsroot} = $actualsroot || $self->{oldsroot};
     $self->{silent} = $silent;
     $self->{inffile} = $inffile;