IntenseWebs/freeipa
3
0
Fork 0
mirror of https://salsa.debian.org/freeipa-team/freeipa.git synced 2025-01-13 09:41:55 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix architecture detection in ldapupdate

Browse Source
This commit is contained in:
Martin Nagy 2008-09-18 22:58:10 +02:00
parent ca07cdb390
commit a62b85a233
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ipa-server/ipaserver/ldapupdate.py
View File

@ -112,9 +112,9 @@ class LDAPUpdate():
etc. Determine if a suffix is needed based on the current etc. Determine if a suffix is needed based on the current
architecture. architecture.
""" """
arch = platform.platform() bits = platform.architecture()[0]
if arch == "x86_64": if bits == "64bit":
return "64" return "64"
else: else:
return "" return ""
@ -320,9 +320,8 @@ class LDAPUpdate():
attrlist = ['nstaskstatus', 'nstaskexitcode'] attrlist = ['nstaskstatus', 'nstaskexitcode']
entry = None entry = None
done = False
while not done: while True:
try: try:
entry = self.conn.getEntry(dn, ldap.SCOPE_BASE, "(objectclass=*)", attrlist) entry = self.conn.getEntry(dn, ldap.SCOPE_BASE, "(objectclass=*)", attrlist)
except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND): except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND):
@ -340,7 +339,7 @@ class LDAPUpdate():
if status.lower().find("finished") > -1: if status.lower().find("finished") > -1:
logging.info("Indexing finished") logging.info("Indexing finished")
done = True break
logging.debug("Indexing in progress") logging.debug("Indexing in progress")
time.sleep(1) time.sleep(1)