[tryton-debian-vcs] tryton-proteus branch debian-jessie-3.2 updated. debian/3.2.1-1-5-g4a2d240

Mathias Behrle tryton-debian-vcs at alioth.debian.org
Thu Dec 4 21:45:04 UTC 2014


The following commit has been merged in the debian-jessie-3.2 branch:
https://alioth.debian.org/plugins/scmgit/cgi-bin/gitweb.cgi/?p=tryton/tryton-proteus.git;a=commitdiff;h=debian/3.2.1-1-5-g4a2d240

commit 4a2d2408ca2a6341e2fd6dce761a821883d7c5c3
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 4 19:23:40 2014 +0100

    Releasing debian version 3.2.2-1.
    
    Signed-off-by: Mathias Behrle <mathiasb at m9s.biz>

diff --git a/debian/changelog b/debian/changelog
index 69a803c..2f57a2f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+tryton-proteus (3.2.2-1) unstable; urgency=medium
+
+  * Adding actual upstream signing key.
+  * Updating to Standards-Version: 3.9.6, no changes needed.
+  * Setting the branch in the watch file to the fixed version 3.2.
+  * Merging upstream version 3.2.2.
+
+ -- Mathias Behrle <mathiasb at m9s.biz>  Thu, 04 Dec 2014 19:23:40 +0100
+
 tryton-proteus (3.2.1-1) unstable; urgency=medium
 
   * Updating signing key while using now plain .asc files instead of .pgp
commit 29eb6db5dee52f8454e904881f38423ada017411
Author: Mathias Behrle <mathiasb at m9s.biz>
Date:   Thu Dec 4 19:23:39 2014 +0100

    Merging upstream version 3.2.2.

diff --git a/CHANGELOG b/CHANGELOG
index 599fe1b..547df2a 100644
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -1,3 +1,6 @@
+Version 3.2.2 - 2014-12-03
+* Bug fixes (see mercurial logs for details)
+
 Version 3.2.1 - 2014-07-02
 * Bug fixes (see mercurial logs for details)
 
diff --git a/PKG-INFO b/PKG-INFO
index d00840d..6b368ef 100644
--- a/PKG-INFO
+++ b/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 3.2.1
+Version: 3.2.2
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus.egg-info/PKG-INFO b/proteus.egg-info/PKG-INFO
index d00840d..6b368ef 100644
--- a/proteus.egg-info/PKG-INFO
+++ b/proteus.egg-info/PKG-INFO
@@ -1,6 +1,6 @@
 Metadata-Version: 1.1
 Name: proteus
-Version: 3.2.1
+Version: 3.2.2
 Summary: Library to access Tryton server as a client
 Home-page: http://www.tryton.org/
 Author: Tryton
diff --git a/proteus/__init__.py b/proteus/__init__.py
index 6c8d8ab..070cfbc 100644
--- a/proteus/__init__.py
+++ b/proteus/__init__.py
@@ -3,7 +3,7 @@
 '''
 A library to access Tryton's models like a client.
 '''
-__version__ = "3.2.1"
+__version__ = "3.2.2"
 __all__ = ['Model', 'Wizard']
 import sys
 try:
@@ -814,7 +814,7 @@ class Model(object):
             for record in to_remove:
                 # remove without signal
                 list.remove(getattr(self, field), record)
-            if value and value.get('add') or value.get('update'):
+            if value and (value.get('add') or value.get('update')):
                 for index, vals in value.get('add', []):
                     relation = Model.get(self._fields[field]['relation'],
                             self._config)
-- 
tryton-proteus



More information about the tryton-debian-vcs mailing list