return None
sa_major_version = sqlalchemy.__version__[0:3]
-if sa_major_version in ["0.5", "0.6", "0.7", "0.8", "0.9"]:
+if sa_major_version in ["0.5", "0.6", "0.7", "0.8", "0.9", "1.0"]:
from sqlalchemy.databases import postgres
postgres.ischema_names['debversion'] = DebVersion
else:
- raise Exception("dak only ported to SQLA versions 0.5 to 0.9 (%s installed). See daklib/dbconn.py" % sa_major_version)
+ raise Exception("dak only ported to SQLA versions 0.5 to 1.0 (%s installed). See daklib/dbconn.py" % sa_major_version)
################################################################################
l.simple_bind_s("","")
Attrs = l.search_s(LDAPDn, ldap.SCOPE_ONELEVEL,
- "(&(keyfingerprint=*)(gidnumber=%s))" % (cnf["Import-Users-From-Passwd::ValidGID"]),
+ "(&(keyfingerprint=*)(supplementaryGid=%s))" % (cnf["Import-Users-From-Passwd::ValidGID"]),
["uid", "keyfingerprint", "cn", "mn", "sn"])
ldap_fin_uid_id = {}
def __init__(self, key = None, value = None, binary = None):
self.key = key
self.value = value
- self.binary = binary
+ if binary is not None:
+ self.binary = binary
def properties(self):
return ['binary', 'key', 'value']
def __init__(self, key = None, value = None, source = None):
self.key = key
self.value = value
- self.source = source
+ if source is not None:
+ self.source = source
def properties(self):
return ['source', 'key', 'value']