diff options
| author | Simo Sorce <ssorce@redhat.com> | 2008-05-15 11:33:07 -0400 |
|---|---|---|
| committer | Simo Sorce <ssorce@redhat.com> | 2008-05-15 14:26:34 -0400 |
| commit | 281ad0addbacef209a400d1465ae94ef48f52aa2 (patch) | |
| tree | c330fc2ee8d202fdde1d563a45c52c5aa3d96682 | |
| parent | 498b96617e16e56229374389db9a09cacb78f099 (diff) | |
| download | freeipa-281ad0addbacef209a400d1465ae94ef48f52aa2.tar.gz freeipa-281ad0addbacef209a400d1465ae94ef48f52aa2.tar.xz freeipa-281ad0addbacef209a400d1465ae94ef48f52aa2.zip | |
Use split instead of find as split does not fail to provide a complete
component if no '.' is found.
| -rw-r--r-- | ipa-server/ipa-install/ipa-server-install | 2 | ||||
| -rw-r--r-- | ipa-server/ipaserver/bindinstance.py | 2 | ||||
| -rw-r--r-- | ipa-server/ipaserver/dsinstance.py | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/ipa-server/ipa-install/ipa-server-install b/ipa-server/ipa-install/ipa-server-install index a7fd30c3..916527c9 100644 --- a/ipa-server/ipa-install/ipa-server-install +++ b/ipa-server/ipa-install/ipa-server-install @@ -175,7 +175,7 @@ def read_ip_address(host_name): fstore.backup_file("/etc/hosts") hosts_fd = open('/etc/hosts', 'r+') hosts_fd.seek(0, 2) - hosts_fd.write(ip+'\t'+host_name+' '+host_name[:host_name.find('.')]+'\n') + hosts_fd.write(ip+'\t'+host_name+' '+host_name.split('.')[0]+'\n') hosts_fd.close() return ip diff --git a/ipa-server/ipaserver/bindinstance.py b/ipa-server/ipaserver/bindinstance.py index 6a52e0f5..3ddbefe1 100644 --- a/ipa-server/ipaserver/bindinstance.py +++ b/ipa-server/ipaserver/bindinstance.py @@ -48,7 +48,7 @@ class BindInstance(service.Service): self.ip_address = ip_address self.realm = realm_name self.domain = domain_name - self.host = fqdn[:fqdn.find(".")] + self.host = fqdn.split(".")[0] self.__setup_sub_dict() diff --git a/ipa-server/ipaserver/dsinstance.py b/ipa-server/ipaserver/dsinstance.py index 4c281a74..9a805481 100644 --- a/ipa-server/ipaserver/dsinstance.py +++ b/ipa-server/ipaserver/dsinstance.py @@ -214,7 +214,7 @@ class DsInstance(service.Service): self.backup_state("running", is_ds_running()) self.backup_state("serverid", self.serverid) - self.sub_dict['BASEDC'] = self.realm_name[:self.realm_name.find('.')].lower() + self.sub_dict['BASEDC'] = self.realm_name.split('.')[0].lower() base_txt = ipautil.template_str(BASE_TEMPLATE, self.sub_dict) logging.debug(base_txt) base_fd = file("/var/lib/dirsrv/boot.ldif", "w") |