summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Nagy <mnagy@redhat.com>2008-09-18 22:58:10 +0200
committerMartin Nagy <mnagy@redhat.com>2008-09-19 17:25:05 +0200
commita62b85a233c7223f3b7f327ba912d2810929dc6a (patch)
tree980097860f26c6a253d5485207ee9fdbc1cda784
parentca07cdb390e78439a8da326d1874276509541661 (diff)
downloadfreeipa-a62b85a233c7223f3b7f327ba912d2810929dc6a.tar.gz
freeipa-a62b85a233c7223f3b7f327ba912d2810929dc6a.tar.xz
freeipa-a62b85a233c7223f3b7f327ba912d2810929dc6a.zip
Fix architecture detection in ldapupdate
-rwxr-xr-xipa-server/ipaserver/ldapupdate.py9
1 files changed, 4 insertions, 5 deletions
diff --git a/ipa-server/ipaserver/ldapupdate.py b/ipa-server/ipaserver/ldapupdate.py
index f4c868383..e28562cec 100755
--- a/ipa-server/ipaserver/ldapupdate.py
+++ b/ipa-server/ipaserver/ldapupdate.py
@@ -112,9 +112,9 @@ class LDAPUpdate():
etc. Determine if a suffix is needed based on the current
architecture.
"""
- arch = platform.platform()
+ bits = platform.architecture()[0]
- if arch == "x86_64":
+ if bits == "64bit":
return "64"
else:
return ""
@@ -320,9 +320,8 @@ class LDAPUpdate():
attrlist = ['nstaskstatus', 'nstaskexitcode']
entry = None
- done = False
- while not done:
+ while True:
try:
entry = self.conn.getEntry(dn, ldap.SCOPE_BASE, "(objectclass=*)", attrlist)
except ipaerror.exception_for(ipaerror.LDAP_NOT_FOUND):
@@ -340,7 +339,7 @@ class LDAPUpdate():
if status.lower().find("finished") > -1:
logging.info("Indexing finished")
- done = True
+ break
logging.debug("Indexing in progress")
time.sleep(1)