[tryton-debian-vcs] tryton-modules-ldap-authentication branch debian updated. debian/2.8.0-3-4-g82fefb2
git repository hosting
tryton-debian-vcs at m9s.biz
Mon Nov 25 19:35:03 UTC 2013
The following commit has been merged in the debian branch:
http://debian.tryton.org/gitweb/?p=packages/tryton-modules-ldap-authentication.git;a=commitdiff;h=debian/2.8.0-3-4-g82fefb2
commit 82fefb216fb968366969973f556716f26e25db6a
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Mon Nov 25 20:30:14 2013 +0100
Releasing debian version 3.0.0-1.
diff --git a/debian/changelog b/debian/changelog
index 228b938..b269f05 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-modules-ldap-authentication (3.0.0-1) unstable; urgency=low
+
+ * Merging upstream version 3.0.0.
+ * Updating to standards version 3.9.5, no changes needed.
+ * Changing to buildsystem pybuild.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Mon, 25 Nov 2013 17:54:12 +0100
+
tryton-modules-ldap-authentication (2.8.0-3) unstable; urgency=low
* Removing pydist-overrides, it is no more needed.
commit ef95cf0fd5c90711f3efebd835da8a52ef8d1b45
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:51:51 2013 +0100
Changing to buildsystem pybuild.
diff --git a/debian/control b/debian/control
index 52acf0d..302a521 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,8 @@ Section: python
Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
-Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
+Build-Depends:
+ debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools, dh-python
Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-ldap-authentication.git
diff --git a/debian/rules b/debian/rules
index 30074ad..5b8c326 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,17 @@
#!/usr/bin/make -f
-MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
-PACKAGE_NAME := $(shell python setup.py --name)
-
-%:
- dh ${@} --with python2
+# needed for pbuilder
+export LC_ALL=C.UTF-8
-override_dh_auto_clean:
- dh_auto_clean
+MAJOR := $(shell python setup.py --version | awk -F "." '{print $$1 "." $$2}')
+PACKAGE_NAME := tryton-modules-$(shell python setup.py --name | sed s/^trytond_// | sed s/_/-/g)
+export PYBUILD_DESTDIR_python2=debian/${PACKAGE_NAME}
-override_dh_auto_build:
- mv $(PACKAGE_NAME).egg-info $(PACKAGE_NAME).hen-info
- mv PKG-INFO PKG-INFO.hen
- dh_auto_build
+# Don't run tests for Tryton modules, they try to download dependencies from pypi
+export PYBUILD_DISABLE_python2.7=test
-override_dh_auto_install:
- dh_auto_install
- rm -rf *.egg-info
- mv $(PACKAGE_NAME).hen-info $(PACKAGE_NAME).egg-info
- mv PKG-INFO.hen PKG-INFO
+%:
+ dh ${@} --with python2 --buildsystem=pybuild
override_dh_gencontrol:
dh_gencontrol -- -Vversion:major="$(MAJOR)"
commit 87e8b3eac543d3b55a8df46a482b9199b8e34228
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 19:14:21 2013 +0100
Updating to standards version 3.9.5, no changes needed.
diff --git a/debian/control b/debian/control
index c23b73b..52acf0d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
Maintainer: Debian Tryton Maintainers <maintainers at debian.tryton.org>
Uploaders: Mathias Behrle <mathiasb at m9s.biz>
Build-Depends: debhelper (>= 9), python (>= 2.6.6-3~), python-setuptools
-Standards-Version: 3.9.4
+Standards-Version: 3.9.5
Homepage: http://www.tryton.org/
Vcs-Browser: http://debian.tryton.org/gitweb/?p=packages/tryton-modules-ldap-authentication.git
Vcs-Git: git://debian.tryton.org/packages/tryton-modules-ldap-authentication.git
commit e0ba6a23820524acc4b9c50f7c075e64e3271c98
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Sun Nov 24 17:27:20 2013 +0100
Merging upstream version 3.0.0.
diff --git a/CHANGELOG b/CHANGELOG
index 831ac3d..b661834 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.0 - 2013-10-21
+* Bug fixes (see mercurial logs for details)
+
Version 2.8.0 - 2013-04-22
* Bug fixes (see mercurial logs for details)
diff --git a/PKG-INFO b/PKG-INFO
index d30bcae..961beed 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond_ldap_authentication
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_ldap_authentication
===========================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/locale/ca_ES.po b/locale/ca_ES.po
index 312c0cb..8783db4 100644
--- a/locale/ca_ES.po
+++ b/locale/ca_ES.po
@@ -2,7 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:res.user:"
msgid "You can not set the password of ldap user \"%s\"."
msgstr "No podeu establir la contrasenya de l'usuari \"%s\" d'ldap."
diff --git a/locale/es_ES.po b/locale/es_ES.po
index 79e2b7c..726478c 100644
--- a/locale/es_ES.po
+++ b/locale/es_ES.po
@@ -2,7 +2,6 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:res.user:"
msgid "You can not set the password of ldap user \"%s\"."
msgstr "No puede establecer la contraseña del usuario \"%s\" de ldap."
diff --git a/locale/fr_FR.po b/locale/fr_FR.po
index 5a75798..d43b296 100644
--- a/locale/fr_FR.po
+++ b/locale/fr_FR.po
@@ -4,7 +4,7 @@ msgstr "Content-Type: text/plain; charset=utf-8\n"
msgctxt "error:res.user:"
msgid "You can not set the password of ldap user \"%s\"."
-msgstr ""
+msgstr "Vous ne pouvez pas définir le mot de passe de l'utilisateur LDAP \"%s\"."
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
@@ -43,14 +43,6 @@ msgid "Base"
msgstr "Base"
msgctxt "selection:ldap.connection,auth_scope:"
-msgid "Base"
-msgstr "Base"
-
-msgctxt "selection:ldap.connection,auth_scope:"
-msgid "OneLevel"
-msgstr "Un niveau"
-
-msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
msgstr "Un niveau"
@@ -58,14 +50,6 @@ msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
msgstr "Sous-arbre"
-msgctxt "selection:ldap.connection,auth_scope:"
-msgid "Subtree"
-msgstr "Sous-arbre"
-
-msgctxt "view:ldap.connection:"
-msgid "Authentication"
-msgstr "Authentification"
-
msgctxt "view:ldap.connection:"
msgid "Authentication"
msgstr "Authentification"
diff --git a/locale/ca_ES.po b/locale/sl_SI.po
similarity index 72%
copy from locale/ca_ES.po
copy to locale/sl_SI.po
index 312c0cb..65cc365 100644
--- a/locale/ca_ES.po
+++ b/locale/sl_SI.po
@@ -2,26 +2,25 @@
msgid ""
msgstr "Content-Type: text/plain; charset=utf-8\n"
-#, fuzzy
msgctxt "error:res.user:"
msgid "You can not set the password of ldap user \"%s\"."
-msgstr "No podeu establir la contrasenya de l'usuari \"%s\" d'ldap."
+msgstr "Za LDAP uporabnika \"%s\" ni možno nastaviti gesla."
msgctxt "field:ldap.connection,auth_base_dn:"
msgid "Base DN"
-msgstr "DN base"
+msgstr "Osnovni DN"
msgctxt "field:ldap.connection,auth_create_user:"
msgid "Create User"
-msgstr "Crea usuari"
+msgstr "Ustvari uporabnika"
msgctxt "field:ldap.connection,auth_require_filter:"
msgid "Require Filter"
-msgstr "Filtre requerit"
+msgstr "Zahtevan filter"
msgctxt "field:ldap.connection,auth_scope:"
msgid "Scope"
-msgstr "Àmbit"
+msgstr "Pristojnost"
msgctxt "field:ldap.connection,auth_uid:"
msgid "UID"
@@ -29,28 +28,28 @@ msgstr "UID"
msgctxt "help:ldap.connection,auth_base_dn:"
msgid "Base DN for authentication"
-msgstr "DN base per a l'autenticació"
+msgstr "Osnovni DN za avtentifikacijo"
msgctxt "help:ldap.connection,auth_create_user:"
msgid "Create user if not in database"
-msgstr "Crea l'usuari si no existeix a la base de dades"
+msgstr "Ustvari uporabnik, če ga ni v bazi podatkov"
msgctxt "help:ldap.connection,auth_uid:"
msgid "UID Attribute for authentication"
-msgstr "Atribut UID per a l'autenticació"
+msgstr "Atribut UID za avtentifikacijo"
msgctxt "selection:ldap.connection,auth_scope:"
msgid "Base"
-msgstr "Base"
+msgstr "Osnova"
msgctxt "selection:ldap.connection,auth_scope:"
msgid "OneLevel"
-msgstr "UnNivell"
+msgstr "Ena raven"
msgctxt "selection:ldap.connection,auth_scope:"
msgid "Subtree"
-msgstr "Subarbre"
+msgstr "Poddrevo"
msgctxt "view:ldap.connection:"
msgid "Authentication"
-msgstr "Autenticació"
+msgstr "Avtentifikacija"
diff --git a/res.py b/res.py
index bb196b2..a9131c8 100644
--- a/res.py
+++ b/res.py
@@ -15,8 +15,8 @@ class User:
def __setup__(cls):
super(User, cls).__setup__()
cls._error_messages.update({
- 'set_passwd_ldap_user': ('You can not set the password of ldap '
- 'user "%s".'),
+ 'set_passwd_ldap_user': (
+ 'You can not set the password of ldap user "%s".'),
})
@staticmethod
@@ -113,7 +113,9 @@ class User:
@classmethod
def get_login(cls, login, password):
- Connection = Pool().get('ldap.connection')
+ pool = Pool()
+ Connection = pool.get('ldap.connection')
+ LoginAttempt = pool.get('res.user.login.attempt')
with Transaction().set_user(0):
connection, = Connection.search([], limit=1)
try:
@@ -129,6 +131,7 @@ class User:
if password and con.simple_bind_s(dn, password):
user_id, _, _ = cls._get_login(login)
if user_id:
+ LoginAttempt.remove(login)
return user_id
elif connection.auth_create_user:
user, = cls.create([{
diff --git a/setup.py b/setup.py
index fa334b2..d1e9b98 100644
--- a/setup.py
+++ b/setup.py
@@ -63,6 +63,7 @@ setup(name='trytond_ldap_authentication',
'Natural Language :: French',
'Natural Language :: German',
'Natural Language :: Russian',
+ 'Natural Language :: Slovenian',
'Natural Language :: Spanish',
'Operating System :: OS Independent',
'Programming Language :: Python :: 2.6',
diff --git a/tests/__init__.py b/tests/__init__.py
index 3670e97..a33f381 100644
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -2,3 +2,5 @@
#this repository contains the full copyright notices and license terms.
from .test_ldap_authentication import suite
+
+__all__ = ['suite']
diff --git a/tryton.cfg b/tryton.cfg
index faf13d5..1f8c8ad 100644
--- a/tryton.cfg
+++ b/tryton.cfg
@@ -1,5 +1,5 @@
[tryton]
-version=2.8.0
+version=3.0.0
depends:
ir
ldap_connection
diff --git a/trytond_ldap_authentication.egg-info/PKG-INFO b/trytond_ldap_authentication.egg-info/PKG-INFO
index 751999d..ad11540 100644
--- a/trytond_ldap_authentication.egg-info/PKG-INFO
+++ b/trytond_ldap_authentication.egg-info/PKG-INFO
@@ -1,12 +1,12 @@
Metadata-Version: 1.1
Name: trytond-ldap-authentication
-Version: 2.8.0
+Version: 3.0.0
Summary: Tryton module to authenticate users through LDAP
Home-page: http://www.tryton.org/
Author: Tryton
Author-email: UNKNOWN
License: GPL-3
-Download-URL: http://downloads.tryton.org/2.8/
+Download-URL: http://downloads.tryton.org/3.0/
Description: trytond_ldap_authentication
===========================
@@ -59,6 +59,7 @@ Classifier: Natural Language :: English
Classifier: Natural Language :: French
Classifier: Natural Language :: German
Classifier: Natural Language :: Russian
+Classifier: Natural Language :: Slovenian
Classifier: Natural Language :: Spanish
Classifier: Operating System :: OS Independent
Classifier: Programming Language :: Python :: 2.6
diff --git a/trytond_ldap_authentication.egg-info/SOURCES.txt b/trytond_ldap_authentication.egg-info/SOURCES.txt
index a54a7ad..f366a96 100644
--- a/trytond_ldap_authentication.egg-info/SOURCES.txt
+++ b/trytond_ldap_authentication.egg-info/SOURCES.txt
@@ -22,6 +22,7 @@ locale/es_ES.po
locale/fr_FR.po
locale/nl_NL.po
locale/ru_RU.po
+locale/sl_SI.po
trytond_ldap_authentication.egg-info/PKG-INFO
trytond_ldap_authentication.egg-info/SOURCES.txt
trytond_ldap_authentication.egg-info/dependency_links.txt
diff --git a/trytond_ldap_authentication.egg-info/requires.txt b/trytond_ldap_authentication.egg-info/requires.txt
index a7e3c14..fa0fbc9 100644
--- a/trytond_ldap_authentication.egg-info/requires.txt
+++ b/trytond_ldap_authentication.egg-info/requires.txt
@@ -1,3 +1,3 @@
python-ldap
-trytond_ldap_connection >= 2.8, < 2.9
-trytond >= 2.8, < 2.9
\ No newline at end of file
+trytond_ldap_connection >= 3.0, < 3.1
+trytond >= 3.0, < 3.1
\ No newline at end of file
--
tryton-modules-ldap-authentication
More information about the tryton-debian-vcs
mailing list