Mercurial > kallithea
changeset 1580:f0437ae274df beta
Automated merge with https://bitbucket.org/marcinkuzminski/rhodecode
| author | Marcin Kuzminski <marcin@python-works.com> |
|---|---|
| date | Thu, 20 Oct 2011 00:36:11 +0200 |
| parents | e0b069468de0 (current diff) 9b80fb893e7f (diff) |
| children | 67377fd685be |
| files | |
| diffstat | 3 files changed, 14 insertions(+), 11 deletions(-) [+] |
line wrap: on
line diff
--- a/rhodecode/lib/__init__.py Wed Oct 19 14:48:08 2011 -0200 +++ b/rhodecode/lib/__init__.py Thu Oct 20 00:36:11 2011 +0200 @@ -394,13 +394,12 @@ try: from vcs import get_repo from vcs.utils.helpers import get_scm - from vcs.exceptions import RepositoryError, VCSError repopath = os.path.join(os.path.dirname(__file__), '..', '..') scm = get_scm(repopath)[0] repo = get_repo(path=repopath, alias=scm) tip = repo.get_changeset() return (tip.revision, tip.short_id) - except (ImportError, RepositoryError, VCSError), err: + except Exception, err: if not quiet: print ("Cannot retrieve rhodecode's revision. Original error " "was: %s" % err)
--- a/rhodecode/lib/auth_ldap.py Wed Oct 19 14:48:08 2011 -0200 +++ b/rhodecode/lib/auth_ldap.py Thu Oct 20 00:36:11 2011 +0200 @@ -53,8 +53,10 @@ if self.TLS_KIND == 'LDAPS': port = port or 689 ldap_server_type = ldap_server_type + 's' - - self.TLS_REQCERT = ldap.__dict__['OPT_X_TLS_' + tls_reqcert] + + OPT_X_TLS_DEMAND = 2 + self.TLS_REQCERT = getattr(ldap, 'OPT_X_TLS_%s' % tls_reqcert, + OPT_X_TLS_DEMAND) self.LDAP_SERVER_ADDRESS = server self.LDAP_SERVER_PORT = port @@ -63,12 +65,12 @@ self.LDAP_BIND_PASS = bind_pass self.LDAP_SERVER = "%s://%s:%s" % (ldap_server_type, - self.LDAP_SERVER_ADDRESS, - self.LDAP_SERVER_PORT) + self.LDAP_SERVER_ADDRESS, + self.LDAP_SERVER_PORT) self.BASE_DN = base_dn self.LDAP_FILTER = ldap_filter - self.SEARCH_SCOPE = ldap.__dict__['SCOPE_' + search_scope] + self.SEARCH_SCOPE = getattr(ldap, 'SCOPE_%s' % search_scope) self.attr_login = attr_login def authenticate_ldap(self, username, password): @@ -88,7 +90,9 @@ if "," in username: raise LdapUsernameError("invalid character in username: ,") try: - ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, '/etc/openldap/cacerts') + if hasattr(ldap,'OPT_X_TLS_CACERTDIR'): + ldap.set_option(ldap.OPT_X_TLS_CACERTDIR, + '/etc/openldap/cacerts') ldap.set_option(ldap.OPT_REFERRALS, ldap.OPT_OFF) ldap.set_option(ldap.OPT_RESTART, ldap.OPT_ON) ldap.set_option(ldap.OPT_TIMEOUT, 20)
--- a/rhodecode/model/db.py Wed Oct 19 14:48:08 2011 -0200 +++ b/rhodecode/model/db.py Thu Oct 20 00:36:11 2011 +0200 @@ -422,10 +422,10 @@ Session.flush() members_list = [] if v: + v = [v] if isinstance(v, basestring) else v for u_id in set(v): - members_list.append(UsersGroupMember( - users_group_id, - u_id)) + member = UsersGroupMember(users_group_id,u_id) + members_list.append(member) setattr(users_group, 'members', members_list) setattr(users_group, k, v)