X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=daklib%2Fdbconn.py;h=3a7f55bbe942df3db4807865dd28a7bf2203627a;hb=165bcf28c9bc21d449253f05efba0b5f39ff6abf;hp=985caf1d2e2b1a7f0bac65fac318d14c454f312c;hpb=38d8ab043fa9d5bc062be20e6656f751a5025362;p=dak.git diff --git a/daklib/dbconn.py b/daklib/dbconn.py old mode 100644 new mode 100755 index 985caf1d..3a7f55bb --- a/daklib/dbconn.py +++ b/daklib/dbconn.py @@ -109,11 +109,11 @@ class DebVersion(UserDefinedType): 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. See daklib/dbconn.py") + raise Exception("dak only ported to SQLA versions 0.5 to 1.0 (%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 = {} @@ -1721,7 +1721,7 @@ class DBSource(ORMObject): 'install_date', 'binaries_count', 'uploaders_count'] def not_null_constraints(self): - return ['source', 'version', 'install_date', 'maintainer', \ + return ['source', 'version', 'maintainer', \ 'changedby', 'poolfile'] def read_control_fields(self):