[tryton-debian-vcs] tryton-server branch debian-jessie-3.0 updated. debian/3.0.8-1-4-gc067aba
Mathias Behrle
tryton-debian-vcs at alioth.debian.org
Wed Feb 18 10:07:24 UTC 2015
The following commit has been merged in the debian-jessie-3.0 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-server.git;a=commitdiff;h=debian/3.0.8-1-4-gc067aba
commit c067aba148b937ecc477403b80315c662df9387c
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 18 10:37:35 2015 +0100
Releasing debian version 3.0.9-1.
Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>
diff --git a/debian/changelog b/debian/changelog
index 473fb07..9be4a87 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+tryton-server (3.0.9-1) unstable; urgency=medium
+
+ * Adding actual upstream signing key.
+ * Merging upstream version 3.0.9.
+ * Updating copyright file.
+
+ -- Mathias Behrle <mathiasb at m9s.biz> Wed, 18 Feb 2015 10:37:35 +0100
+
tryton-server (3.0.8-1) unstable; urgency=medium
* Merging upstream version 3.0.8.
commit 73f60ae72c428cf2f43d8fc8be4e6ee9132f7c60
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 18 10:37:35 2015 +0100
Updating copyright file.
diff --git a/debian/copyright b/debian/copyright
index 801be74..5cac357 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,9 +2,9 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Files: *
Copyright: 2004-2008 Tiny SPRL
- 2007-2014 Cédric Krier
+ 2007-2015 Cédric Krier
2007-2013 Bertrand Chenal
- 2008-2014 B2CK SPRL
+ 2008-2015 B2CK SPRL
2011 Openlabs Technologies & Consulting (P) Ltd
License: GPL-3+
commit 1f9d6ecee3e279303457fa86910bae87d510498d
Author: Mathias Behrle <mathiasb at m9s.biz>
Date: Wed Feb 18 10:37:35 2015 +0100
Merging upstream version 3.0.9.
diff --git a/CHANGELOG b/CHANGELOG
index f5f022a..30bc4dc 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.0.9 - 2015-02-16
+* Bug fixes (see mercurial logs for details)
+
Version 3.0.8 - 2014-11-06
* Bug fixes (see mercurial logs for details)
diff --git a/COPYRIGHT b/COPYRIGHT
index 56848fa..16cc09a 100644
--- a/COPYRIGHT
+++ b/COPYRIGHT
@@ -1,7 +1,7 @@
Copyright (C) 2004-2008 Tiny SPRL.
-Copyright (C) 2007-2014 Cédric Krier.
+Copyright (C) 2007-2015 Cédric Krier.
Copyright (C) 2007-2013 Bertrand Chenal.
-Copyright (C) 2008-2014 B2CK SPRL.
+Copyright (C) 2008-2015 B2CK SPRL.
Copyright (C) 2011 Openlabs Technologies & Consulting (P) Ltd.
This program is free software: you can redistribute it and/or modify
diff --git a/PKG-INFO b/PKG-INFO
index 324295a..a19c613 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 3.0.8
+Version: 3.0.9
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 324295a..a19c613 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.0.8
+Version: 3.0.9
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 761a055..661ee9f 100644
--- a/trytond/backend/postgresql/database.py
+++ b/trytond/backend/postgresql/database.py
@@ -179,7 +179,7 @@ class Database(DatabaseInterface):
res = Database._list_cache
if res and abs(Database._list_cache_timestamp - now) < timeout:
return res
- db_user = CONFIG['db_user']
+ db_user = CONFIG['db_user'] or os.environ.get('PGUSER')
if not db_user and os.name == 'posix':
db_user = pwd.getpwuid(os.getuid())[0]
if not db_user:
@@ -353,7 +353,7 @@ class Cursor(CursorInterface):
return self.cursor.fetchone()[0]
def lock(self, table):
- self.cursor.execute('LOCK "%s"' % table)
+ self.cursor.execute('LOCK "%s" NOWAIT' % table)
def has_constraint(self):
return True
diff --git a/trytond/model/fields/one2one.py b/trytond/model/fields/one2one.py
index eea5ac8..e302a0b 100644
--- a/trytond/model/fields/one2one.py
+++ b/trytond/model/fields/one2one.py
@@ -25,7 +25,7 @@ class One2One(Many2Many):
'''
res = super(One2One, self).get(ids, model, name, values=values)
for i, vals in res.iteritems():
- res[i] = vals[0] if vals else False
+ res[i] = vals[0] if vals else None
return res
def set(self, ids, model, name, value):
diff --git a/trytond/model/modelview.py b/trytond/model/modelview.py
index 1bb3046..842fb7f 100644
--- a/trytond/model/modelview.py
+++ b/trytond/model/modelview.py
@@ -358,7 +358,8 @@ class ModelView(Model):
fields_def.setdefault(field_children, {'name': field_children})
if field_children in cls._fields:
field = cls._fields[field_children]
- fields_def.setdefault(field.field, {'name': field.field})
+ if hasattr(field, 'field'):
+ fields_def.setdefault(field.field, {'name': field.field})
for field_name in fields_def.keys():
if field_name in cls._fields:
diff --git a/trytond/pyson.py b/trytond/pyson.py
index 1e50b16..1802386 100644
--- a/trytond/pyson.py
+++ b/trytond/pyson.py
@@ -567,4 +567,5 @@ CONTEXT = {
'In': In,
'Date': Date,
'DateTime': DateTime,
+ 'Id': Id,
}
diff --git a/trytond/version.py b/trytond/version.py
index cf150fb..edd9337 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.0.8"
+VERSION = "3.0.9"
LICENSE = "GPL-3"
WEBSITE = "http://www.tryton.org/"
--
tryton-server
More information about the tryton-debian-vcs
mailing list