Hello community,
here is the log from the commit of package trytond for openSUSE:Factory checked
in at 2019-01-28 20:49:20
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/trytond (Old)
and /work/SRC/openSUSE:Factory/.trytond.new.28833 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "trytond"
Mon Jan 28 20:49:20 2019 rev:28 rq:668943 version:4.6.12
Changes:
--------
--- /work/SRC/openSUSE:Factory/trytond/trytond.changes 2019-01-21
10:50:14.604027491 +0100
+++ /work/SRC/openSUSE:Factory/.trytond.new.28833/trytond.changes
2019-01-28 20:50:05.533800943 +0100
@@ -1,0 +2,5 @@
+Sun Jan 27 20:48:07 UTC 2019 - Axel Braun <axel.br...@gmx.de>
+
+- Version 4.6.12 - Bugfix Release
+
+-------------------------------------------------------------------
Old:
----
trytond-4.6.11.tar.gz
New:
----
trytond-4.6.12.tar.gz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ trytond.spec ++++++
--- /var/tmp/diff_new_pack.QJ11ut/_old 2019-01-28 20:50:06.025800424 +0100
+++ /var/tmp/diff_new_pack.QJ11ut/_new 2019-01-28 20:50:06.025800424 +0100
@@ -20,7 +20,7 @@
%define majorver 4.6
%define base_name tryton
Name: trytond
-Version: %{majorver}.11
+Version: %{majorver}.12
Release: 0
Summary: An Enterprise Resource Planning (ERP) system
++++++ trytond-4.6.11.tar.gz -> trytond-4.6.12.tar.gz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trytond-4.6.11/.hgtags new/trytond-4.6.12/.hgtags
--- old/trytond-4.6.11/.hgtags 2019-01-05 18:28:06.000000000 +0100
+++ new/trytond-4.6.12/.hgtags 2019-01-22 22:15:16.000000000 +0100
@@ -28,3 +28,4 @@
f7e8f2683f736f550db843d1cfffcb765f93a3e8 4.6.9
33062440736f51dcb35af1c9f352bc774b41dca4 4.6.10
7a9cd116456e44ab424e84e8449281ee54f9d37c 4.6.11
+2df97bd1d3af946c8a0af4c96a0661c2c1213e23 4.6.12
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trytond-4.6.11/CHANGELOG new/trytond-4.6.12/CHANGELOG
--- old/trytond-4.6.11/CHANGELOG 2019-01-05 18:28:05.000000000 +0100
+++ new/trytond-4.6.12/CHANGELOG 2019-01-22 22:15:16.000000000 +0100
@@ -1,3 +1,6 @@
+Version 4.6.12 - 2019-01-22
+* Bug fixes (see mercurial logs for details)
+
Version 4.6.11 - 2019-01-05
* Bug fixes (see mercurial logs for details)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trytond-4.6.11/PKG-INFO new/trytond-4.6.12/PKG-INFO
--- old/trytond-4.6.11/PKG-INFO 2019-01-05 18:28:07.000000000 +0100
+++ new/trytond-4.6.12/PKG-INFO 2019-01-22 22:15:17.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 4.6.11
+Version: 4.6.12
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trytond-4.6.11/trytond/__init__.py
new/trytond-4.6.12/trytond/__init__.py
--- old/trytond-4.6.11/trytond/__init__.py 2018-12-03 00:41:29.000000000
+0100
+++ new/trytond-4.6.12/trytond/__init__.py 2019-01-05 18:28:41.000000000
+0100
@@ -5,7 +5,7 @@
import warnings
from email import charset
-__version__ = "4.6.11"
+__version__ = "4.6.12"
os.environ['TZ'] = 'UTC'
if hasattr(time, 'tzset'):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trytond-4.6.11/trytond/model/fields/selection.py
new/trytond-4.6.12/trytond/model/fields/selection.py
--- old/trytond-4.6.11/trytond/model/fields/selection.py 2018-08-20
22:55:11.000000000 +0200
+++ new/trytond-4.6.12/trytond/model/fields/selection.py 2019-01-14
18:57:24.000000000 +0100
@@ -74,12 +74,18 @@
table, _ = tables[None]
selections = Model.fields_get([name])[name]['selection']
if not isinstance(selections, (tuple, list)):
- selections = getattr(Model, selections)()
+ if not is_instance_method(Model, selections):
+ selections = getattr(Model, selections)()
+ else:
+ selections = []
column = self.sql_column(table)
whens = []
for key, value in selections:
whens.append((column == key, value))
- return [Case(*whens, else_=column)]
+ if whens:
+ return [Case(*whens, else_=column)]
+ else:
+ return [column]
class TranslatedSelection(object):
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trytond-4.6.11/trytond/protocols/xmlrpc.py
new/trytond-4.6.12/trytond/protocols/xmlrpc.py
--- old/trytond-4.6.11/trytond/protocols/xmlrpc.py 2018-08-20
22:55:19.000000000 +0200
+++ new/trytond-4.6.12/trytond/protocols/xmlrpc.py 2019-01-14
18:57:24.000000000 +0100
@@ -9,7 +9,7 @@
from werkzeug.wrappers import Response
from werkzeug.utils import cached_property
-from werkzeug.exceptions import BadRequest
+from werkzeug.exceptions import BadRequest, InternalServerError
from trytond.protocols.wrappers import Request
from trytond.exceptions import TrytonException
@@ -167,12 +167,17 @@
@classmethod
def response(cls, data, request):
- if isinstance(data, TrytonException):
- data = client.Fault(data.code, str(data))
- elif isinstance(data, Exception):
- data = client.Fault(255, str(data))
+ if isinstance(request, XMLRequest):
+ if isinstance(data, TrytonException):
+ data = client.Fault(data.code, str(data))
+ elif isinstance(data, Exception):
+ data = client.Fault(255, str(data))
+ else:
+ data = (data,)
+ return Response(client.dumps(
+ data, methodresponse=True, allow_none=True),
+ content_type='text/xml')
else:
- data = (data,)
- return Response(client.dumps(
- data, methodresponse=True, allow_none=True),
- content_type='text/xml')
+ if isinstance(data, Exception):
+ return InternalServerError(data)
+ return Response(data)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/trytond-4.6.11/trytond.egg-info/PKG-INFO
new/trytond-4.6.12/trytond.egg-info/PKG-INFO
--- old/trytond-4.6.11/trytond.egg-info/PKG-INFO 2019-01-05
18:28:06.000000000 +0100
+++ new/trytond-4.6.12/trytond.egg-info/PKG-INFO 2019-01-22
22:15:17.000000000 +0100
@@ -1,6 +1,6 @@
Metadata-Version: 1.1
Name: trytond
-Version: 4.6.11
+Version: 4.6.12
Summary: Tryton server
Home-page: http://www.tryton.org/
Author: Tryton
