diff options
| author | Thomas Lackey <tlackey@redhat.com> | 2005-04-11 18:02:10 +0000 |
|---|---|---|
| committer | Thomas Lackey <tlackey@redhat.com> | 2005-04-11 18:02:10 +0000 |
| commit | 86feb680fab9462848ea0bde5dbc42823320f25c (patch) | |
| tree | bc5a2b0e00ee710d87b62b15f0c105cdec62f32e /ldap/admin/src/scripts | |
| parent | 855625aa55278373471c4846de6d6317a6066216 (diff) | |
| download | ds-86feb680fab9462848ea0bde5dbc42823320f25c.tar.gz ds-86feb680fab9462848ea0bde5dbc42823320f25c.tar.xz ds-86feb680fab9462848ea0bde5dbc42823320f25c.zip | |
Allow the migration scripts to recognize the Red Hat-branded server.
Diffstat (limited to 'ldap/admin/src/scripts')
| -rw-r--r-- | ldap/admin/src/scripts/template-migrate6to7 | 9 | ||||
| -rw-r--r-- | ldap/admin/src/scripts/template-migrateInstance7 | 9 | ||||
| -rw-r--r-- | ldap/admin/src/scripts/template-migrateTo7 | 9 |
3 files changed, 21 insertions, 6 deletions
diff --git a/ldap/admin/src/scripts/template-migrate6to7 b/ldap/admin/src/scripts/template-migrate6to7 index 16997477..01b0c6da 100644 --- a/ldap/admin/src/scripts/template-migrate6to7 +++ b/ldap/admin/src/scripts/template-migrate6to7 @@ -2839,7 +2839,7 @@ sub getVersion { sleep(1); # allow some data to accumulate in the pipe # print "Output from $prog -v:\n"; while (<F>) { - if (/^Netscape-Directory/ || /^iPlanet-Directory/i) { + if (/^Red Hat-Directory/ || /^Netscape-Directory/ || /^iPlanet-Directory/i) { $versionstr = $_; last; } @@ -2849,7 +2849,12 @@ sub getVersion { $ENV{"$LIB_PATH"}=$cur_libpath; } - if ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) { + if ($versionstr =~ /^Red Hat-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) { + $version = $1; + $minor = $2; + $buildNumber = $3; + } + elsif ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) { $version = $1; $minor = $2; $buildNumber = $3; diff --git a/ldap/admin/src/scripts/template-migrateInstance7 b/ldap/admin/src/scripts/template-migrateInstance7 index 62752778..205432bd 100644 --- a/ldap/admin/src/scripts/template-migrateInstance7 +++ b/ldap/admin/src/scripts/template-migrateInstance7 @@ -487,7 +487,7 @@ sub getVersion { sleep(1); # allow some data to accumulate in the pipe # print "Output from $prog -v:\n"; while (<F>) { - if (/^Netscape-Directory/ || /^iPlanet-Directory/i) { + if (/^Red Hat-Directory/ || /^Netscape-Directory/ || /^iPlanet-Directory/i) { $versionstr = $_; last; } @@ -497,7 +497,12 @@ sub getVersion { $ENV{"$LIB_PATH"}="$root${PATHSEP}lib${SEP}".$ENV{"$LIB_PATH"}; } - if ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) { + if ($versionstr =~ /^Red Hat-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) { + $version = $1; + $minor = $2; + $buildNumber = $3; + } + elsif ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) { $version = $1; $minor = $2; $buildNumber = $3; diff --git a/ldap/admin/src/scripts/template-migrateTo7 b/ldap/admin/src/scripts/template-migrateTo7 index bf06372d..4d51265b 100644 --- a/ldap/admin/src/scripts/template-migrateTo7 +++ b/ldap/admin/src/scripts/template-migrateTo7 @@ -3012,7 +3012,7 @@ sub getVersion { sleep(1); # allow some data to accumulate in the pipe # print "Output from $prog -v:\n"; while (<F>) { - if (/^Netscape-Directory/ || /^iPlanet-Directory/i) { + if (/^Red Hat-Directory/ || /^Netscape-Directory/ || /^iPlanet-Directory/i) { $versionstr = $_; last; } @@ -3022,7 +3022,12 @@ sub getVersion { $ENV{"$LIB_PATH"}=$cur_libpath; } - if ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) { + if ($versionstr =~ /^Red Hat-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) { + $version = $1; + $minor = $2; + $buildNumber = $3; + } + elsif ($versionstr =~ /^Netscape-Directory\/(\d+)\.(\d+)(?:b\d)*\s+(\S+)/) { $version = $1; $minor = $2; $buildNumber = $3; |