[tryton-debian-vcs] tryton-server branch upstream-3.2 updated. upstream/3.2.6-1-gc93d08d

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Wed May 20 20:27:08 UTC 2015


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

commit c93d08d3504dd2be7c12d51eb3d92f35d9332326
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Wed May 20 14:18:59 2015 +0200

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

diff --git a/CHANGELOG b/CHANGELOG
index 12263cb..a4db4de 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.7 - 2015-05-19
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.6 - 2015-03-30
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index 92bdefd..d5f40f9 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.2.6
+Version: 3.2.7
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond.egg-info/PKG-INFO b/trytond.egg-info/PKG-INFO
index 92bdefd..d5f40f9 100644
--- a/trytond.egg-info/PKG-INFO
+++ b/trytond.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: trytond
-Version: 3.2.6
+Version: 3.2.7
 Summary: Tryton server
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/trytond/backend/postgresql/database.py b/trytond/backend/postgresql/database.py
index 02d89d8..58cc37e 100644
--- a/trytond/backend/postgresql/database.py
+++ b/trytond/backend/postgresql/database.py
@@ -134,6 +134,7 @@ class Database(DatabaseInterface):
         database.create(cursor, database_name)
         cursor.commit()
         cursor.close()
+        database.close()
 
         cmd = ['pg_restore', '--no-owner']
         if CONFIG['db_user']:
diff --git a/trytond/cache.py b/trytond/cache.py
index c6d7adb..4ef2279 100644
--- a/trytond/cache.py
+++ b/trytond/cache.py
@@ -127,6 +127,11 @@ class Cache(object):
             cursor.commit()
             cursor.close()
 
+    @classmethod
+    def drop(cls, dbname):
+        for inst in cls._cache_instance:
+            inst._cache.pop(dbname, None)
+
 
 class LRUDict(OrderedDict):
     """
diff --git a/trytond/model/modelstorage.py b/trytond/model/modelstorage.py
index f463813..1982ab2 100644
--- a/trytond/model/modelstorage.py
+++ b/trytond/model/modelstorage.py
@@ -293,10 +293,11 @@ class ModelStorage(Model):
                 or isinstance(f, fields.Property))]
         ids = map(int, records)
         datas = cls.read(ids, fields_names=fields_names)
+        datas = dict((d['id'], d) for d in datas)
         field_defs = cls.fields_get(fields_names=fields_names)
         to_create = []
-        for data in datas:
-            data = convert_data(field_defs, data)
+        for id in ids:
+            data = convert_data(field_defs, datas[id])
             to_create.append(data)
         new_records = cls.create(to_create)
         new_ids = dict(izip(ids, map(int, new_records)))
diff --git a/trytond/protocols/dispatcher.py b/trytond/protocols/dispatcher.py
index 27ca1a6..8bb03e1 100644
--- a/trytond/protocols/dispatcher.py
+++ b/trytond/protocols/dispatcher.py
@@ -277,6 +277,7 @@ def drop(database_name, password):
         else:
             logger.info('DROP DB: %s' % (database_name))
             Pool.stop(database_name)
+            Cache.drop(database_name)
     return True
 
 
diff --git a/trytond/version.py b/trytond/version.py
index 46848d3..64f9c38 100644
--- a/trytond/version.py
+++ b/trytond/version.py
@@ -1,6 +1,6 @@
 #This file is part of Tryton.  The COPYRIGHT file at the top level of
 #this repository contains the full copyright notices and license terms.
 PACKAGE = "trytond"
-VERSION = "3.2.6"
+VERSION = "3.2.7"
 LICENSE = "GPL-3"
 WEBSITE = "http://www.tryton.org/"
-- 
tryton-server



More information about the tryton-debian-vcs mailing list