X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=c792ff5a7e48e18f78cb00d1bc93863aca24855a;hb=98d086ddda3772fb58c1bfa97478e8044596b569;hp=2d10eff35446b9b0b663bbfcbedd1723d8decd41;hpb=eec8a0204cba3f1d2afc2a12692d4634b41edb41;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py old mode 100644 new mode 100755 index 2d10eff3..c792ff5a --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -113,7 +113,7 @@ if sa_major_version in ["0.5", "0.6", "0.7", "0.8", "0.9"]: from sqlalchemy.databases import postgres postgres.ischema_names['debversion'] = DebVersion else: - raise Exception("dak only ported to SQLA versions 0.5 to 0.9. See daklib/dbconn.py") + raise Exception("dak only ported to SQLA versions 0.5 to 0.9 (%s installed). See daklib/dbconn.py" % sa_major_version) ################################################################################ @@ -1031,7 +1031,7 @@ class Keyring(object): 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 = {}