summaryrefslogtreecommitdiffstats
path: root/ipa-server
diff options
context:
space:
mode:
authorRob Crittenden <rcritten@redhat.com>2008-02-08 15:10:26 -0500
committerRob Crittenden <rcritten@redhat.com>2008-02-08 15:10:26 -0500
commit6e0bda98e343fbe9aa901ee457df658f79148919 (patch)
treedfbb44e4f1aa717faf2ca7017986a919cf1fcc08 /ipa-server
parent9e3963acd501b2ffdf3f0b19f0aa6d39a010a592 (diff)
downloadfreeipa-6e0bda98e343fbe9aa901ee457df658f79148919.tar.gz
freeipa-6e0bda98e343fbe9aa901ee457df658f79148919.tar.xz
freeipa-6e0bda98e343fbe9aa901ee457df658f79148919.zip
Missed a place to translate the realm name into an instance name
Catch SystemExit exceptions otherwise a trace will be shown with python 2.4
Diffstat (limited to 'ipa-server')
-rw-r--r--ipa-server/ipa-install/ipa-replica-prepare4
1 files changed, 3 insertions, 1 deletions
diff --git a/ipa-server/ipa-install/ipa-replica-prepare b/ipa-server/ipa-install/ipa-replica-prepare
index 124b033ca..7bfc79124 100644
--- a/ipa-server/ipa-install/ipa-replica-prepare
+++ b/ipa-server/ipa-install/ipa-replica-prepare
@@ -132,7 +132,7 @@ def main():
check_ipa_configuration(realm_name)
host_name = get_host_name()
- ds_dir = dsinstance.config_dirname(realm_name)
+ ds_dir = dsinstance.config_dirname(dsinstance.realm_to_serverid(realm_name))
ds_user = get_ds_user(ds_dir)
print "Preparing replica for %s from %s" % (replica_fqdn, host_name)
@@ -162,6 +162,8 @@ try:
sys.exist("The replica must be created on the primary IPA server.")
main()
+except SystemExit, e:
+ sys.exit(e)
except Exception, e:
print "preparation of replica failed: %s" % str(e)
message = str(e)