summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNoriko Hosoi <nhosoi@redhat.com>2009-03-24 22:50:20 +0000
committerNoriko Hosoi <nhosoi@redhat.com>2009-03-24 22:50:20 +0000
commitd71cd7eb7ae6a8899f0c351eb029544180e65885 (patch)
tree2907d7c4cc15aa15d175a63b5c254fb6b437568d
parent12568dfd5b4c9920d41827d5bd7d62b339fdd179 (diff)
downloadds-d71cd7eb7ae6a8899f0c351eb029544180e65885.tar.gz
ds-d71cd7eb7ae6a8899f0c351eb029544180e65885.tar.xz
ds-d71cd7eb7ae6a8899f0c351eb029544180e65885.zip
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.
-rw-r--r--ldap/admin/src/scripts/Migration.pm.in2
1 files changed, 2 insertions, 0 deletions
diff --git a/ldap/admin/src/scripts/Migration.pm.in b/ldap/admin/src/scripts/Migration.pm.in
index 86eb6fd1..e911278e 100644
--- a/ldap/admin/src/scripts/Migration.pm.in
+++ b/ldap/admin/src/scripts/Migration.pm.in
@@ -205,7 +205,9 @@ sub init {
my $oldpkgname = "@brand@-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;