[tryton-debian-vcs] tryton-neso branch upstream updated. upstream/3.6.0-1-g7b52c3d

[Mathias Behrle]

The following commit has been merged in the upstream branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-neso.git;a=commitdiff;h=upstream/3.6.0-1-g7b52c3d

commit 7b52c3d3476defc4ab285d95c9ce2acb96798d9d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed Jul 15 14:20:29 2015 +0200

    Adding upstream version 3.6.1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/CHANGELOG b/CHANGELOG
index a1c6395..8437165 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.6.1 - 2015-07-13
+* Bug fixes (see mercurial logs for details)
+
 Version 3.6.0 - 2015-04-20
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 929c834..9938904 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: neso
-Version: 3.6.0
+Version: 3.6.1
 Summary: Standalone Client/Server for the Tryton Application Platform
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/bin/neso b/bin/neso
index de3fc3e..c480681 100755
--- a/bin/neso
+++ b/bin/neso
@@ -49,7 +49,7 @@ if os.name == 'mac' or \
         os.environ['GTK_IM_MODULE_FILE'] = immodules
 
 import gtk
-from neso.version import VERSION
+from neso import __version__
 
 for i in ('tryton', 'trytond'):
     try:
@@ -84,7 +84,7 @@ if not os.path.isdir(DATA_DIR):
         sys.getfilesystemencoding()), '.neso')
     if not os.path.isdir(DATA_DIR):
         os.mkdir(DATA_DIR, 0700)
-VERSION_DATA_DIR = os.path.join(DATA_DIR, VERSION.rsplit('.', 1)[0])
+VERSION_DATA_DIR = os.path.join(DATA_DIR, __version__.rsplit('.', 1)[0])
 if not os.path.isdir(VERSION_DATA_DIR):
     os.mkdir(VERSION_DATA_DIR, 0700)
 
@@ -215,9 +215,15 @@ def cron():
             if thread and thread.is_alive():
                 continue
             pool = Pool(dbname)
-            if 'ir.cron' not in pool.object_name_list():
+            if not pool.local.acquire(0):
                 continue
-            Cron = pool.get('ir.cron')
+            try:
+                try:
+                    Cron = pool.get('ir.cron')
+                except KeyError:
+                    continue
+            finally:
+                pool.lock.release()
             thread = threading.Thread(
                     target=Cron.run,
                     args=(dbname,), kwargs={})
@@ -343,11 +349,11 @@ DBLogin.run = DBLogin_run
 
 
 class NesoClient(tryton.client.TrytonClient):
-    @classmethod
-    def sig_quit(cls, *args, **kwargs):
+
+    def quit_mainloop(self):
         global CRON_RUNNING
         CRON_RUNNING = False
         thread.join()
-        super(NesoClient, cls).sig_quit(*args, **kwargs)
+        super(NesoClient, self).quit_mainloop()
 
 NesoClient().run()
diff --git a/neso.egg-info/PKG-INFO b/neso.egg-info/PKG-INFO
index 929c834..9938904 100644
--- a/neso.egg-info/PKG-INFO
+++ b/neso.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: neso
-Version: 3.6.0
+Version: 3.6.1
 Summary: Standalone Client/Server for the Tryton Application Platform
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/neso/__init__.py b/neso/__init__.py
index 61b26b3..7d7e270 100644
--- a/neso/__init__.py
+++ b/neso/__init__.py
@@ -1,3 +1,3 @@
 # This file is part of Tryton.  The COPYRIGHT file at the top level of
 # this repository contains the full copyright notices and license terms.
-__version__ = "3.6.0"
+__version__ = "3.6.1"
-- 
tryton-neso