Your message dated Mon, 08 Oct 2012 20:26:06 +0100 with message-id <1349724366.11774.24.ca...@jacala.jungle.funky-badger.org> and subject line Re: Bug#687695: pre-approve unblock: tryton-modules-party-vcarddav/2.2.1-1 has caused the Debian Bug report #687695, regarding pre-approve unblock: tryton-modules-party-vcarddav/2.2.1-1 to be marked as done.
This means that you claim that the problem has been dealt with. If this is not the case it is now your responsibility to reopen the Bug report if necessary, and/or fix the problem forthwith. (NB: If you are a system administrator and have no idea what this message is talking about, this may indicate a serious mail system misconfiguration somewhere. Please contact ow...@bugs.debian.org immediately.) -- 687695: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=687695 Debian Bug Tracking System Contact ow...@bugs.debian.org with problems
--- Begin Message ---Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock Dear release managers, please approve the upload of tryton-modules-party-vcarddav_2.2.1-1. The new version contains the upstream bug fix release [1]. The fixes are for * Create new uuid for every party on copy * Convert buffer into string for vobject * Reports must no more be encoded in base64 Mathias [1] http://news.tryton.org/2012/09/maintenance-releases-for-supported.html debdiff attached unblock: tryton-modules-party-vcarddav/2.2.1-1diff -Nru tryton-modules-party-vcarddav-2.2.0/CHANGELOG tryton-modules-party-vcarddav-2.2.1/CHANGELOG --- tryton-modules-party-vcarddav-2.2.0/CHANGELOG 2011-10-24 23:15:56.000000000 +0200 +++ tryton-modules-party-vcarddav-2.2.1/CHANGELOG 2012-09-02 16:23:08.000000000 +0200 @@ -1,3 +1,6 @@ +Version 2.2.1 - 2012-09-02 +* Bug fixes (see mercurial logs for details) + Version 2.2.0 - 2011-10-24 * Bug fixes (see mercurial logs for details) diff -Nru tryton-modules-party-vcarddav-2.2.0/COPYRIGHT tryton-modules-party-vcarddav-2.2.1/COPYRIGHT --- tryton-modules-party-vcarddav-2.2.0/COPYRIGHT 2011-07-06 09:56:51.000000000 +0200 +++ tryton-modules-party-vcarddav-2.2.1/COPYRIGHT 2012-09-02 16:23:07.000000000 +0200 @@ -1,6 +1,6 @@ -Copyright (C) 2009-2011 Cédric Krier. +Copyright (C) 2009-2012 Cédric Krier. Copyright (C) 2009-2011 Bertrand Chenal. -Copyright (C) 2009-2011 B2CK SPRL. +Copyright (C) 2009-2012 B2CK SPRL. This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -Nru tryton-modules-party-vcarddav-2.2.0/debian/changelog tryton-modules-party-vcarddav-2.2.1/debian/changelog --- tryton-modules-party-vcarddav-2.2.0/debian/changelog 2012-06-30 18:21:36.000000000 +0200 +++ tryton-modules-party-vcarddav-2.2.1/debian/changelog 2012-09-12 16:56:20.000000000 +0200 @@ -1,3 +1,10 @@ +tryton-modules-party-vcarddav (2.2.1-1) unstable; urgency=low + + * Merging upstream version 2.2.1. + * Refreshing patch 01-support-pywebdav-0.9.8. + + -- Mathias Behrle <mathi...@m9s.biz> Wed, 12 Sep 2012 16:56:03 +0200 + tryton-modules-party-vcarddav (2.2.0-3) unstable; urgency=low * Updating maintainers field. diff -Nru tryton-modules-party-vcarddav-2.2.0/debian/patches/01-support-pywebdav-0.9.8 tryton-modules-party-vcarddav-2.2.1/debian/patches/01-support-pywebdav-0.9.8 --- tryton-modules-party-vcarddav-2.2.0/debian/patches/01-support-pywebdav-0.9.8 2012-06-30 16:46:40.000000000 +0200 +++ tryton-modules-party-vcarddav-2.2.1/debian/patches/01-support-pywebdav-0.9.8 2012-09-12 16:55:12.000000000 +0200 @@ -1,7 +1,7 @@ Author: Mathias Behrle <mathi...@m9s.biz> Description: Support new structure of pywebdav > 0.9.4.1. ---- tryton-modules-party-vcarddav.orig/carddav.py 2012-01-02 12:49:50.708128811 +0100 -+++ tryton-modules-party-vcarddav/carddav.py 2012-03-26 16:07:58.090847515 +0200 +--- tryton-modules-party-vcarddav.orig/carddav.py 2011-10-24 23:17:47.000000000 +0200 ++++ tryton-modules-party-vcarddav/carddav.py 2012-09-12 16:54:51.489662701 +0200 @@ -1,7 +1,11 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. @@ -16,11 +16,11 @@ from trytond.protocols.webdav import TrytonDAVInterface, CACHE from trytond.pool import Pool from trytond.transaction import Transaction ---- tryton-modules-party-vcarddav.orig/webdav.py 2012-01-02 12:49:50.712128604 +0100 -+++ tryton-modules-party-vcarddav/webdav.py 2012-03-26 16:09:34.807554228 +0200 -@@ -2,7 +2,10 @@ +--- tryton-modules-party-vcarddav.orig/webdav.py 2012-09-12 15:53:56.994986069 +0200 ++++ tryton-modules-party-vcarddav/webdav.py 2012-09-12 16:54:51.493662568 +0200 +@@ -1,7 +1,10 @@ + #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. - import base64 import urlparse -from DAV.errors import DAV_NotFound, DAV_Forbidden +try: @@ -30,7 +30,7 @@ from trytond.model import ModelView, ModelSQL from trytond.tools import reduce_ids from trytond.transaction import Transaction -@@ -148,7 +151,10 @@ +@@ -147,7 +150,10 @@ return res def get_resourcetype(self, uri, cache=None): diff -Nru tryton-modules-party-vcarddav-2.2.0/party.py tryton-modules-party-vcarddav-2.2.1/party.py --- tryton-modules-party-vcarddav-2.2.0/party.py 2011-09-30 22:53:56.000000000 +0200 +++ tryton-modules-party-vcarddav-2.2.1/party.py 2012-08-23 23:43:32.000000000 +0200 @@ -1,6 +1,5 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -import base64 import copy import uuid from trytond.model import ModelSQL, ModelView, fields @@ -50,11 +49,23 @@ return res def copy(self, ids, default=None): + int_id = isinstance(ids, (int, long)) + if int_id: + ids = [ids] + if default is None: default = {} - default = default.copy() - default['uuid'] = self.default_uuid() - return super(Party, self).copy(ids, default=default) + + new_ids = [] + for party_id in ids: + current_default = default.copy() + current_default['uuid'] = self.default_uuid() + new_id = super(Party, self).copy(party_id, default=current_default) + new_ids.append(new_id) + + if int_id: + return new_ids[0] + return new_ids def write(self, ids, vals): collection_obj = Pool().get('webdav.collection') @@ -274,7 +285,7 @@ data = ''.join(self.create_vcard(party).serialize() for party in parties) - return ('vcf', base64.encodestring(data), False, action_report.name) + return ('vcf', buffer(data), False, action_report.name) def create_vcard(self, party): ''' @@ -286,7 +297,7 @@ import vobject if party.vcard: - vcard = vobject.readOne(party.vcard) + vcard = vobject.readOne(str(party.vcard)) else: vcard = vobject.vCard() if not hasattr(vcard, 'n'): diff -Nru tryton-modules-party-vcarddav-2.2.0/PKG-INFO tryton-modules-party-vcarddav-2.2.1/PKG-INFO --- tryton-modules-party-vcarddav-2.2.0/PKG-INFO 2011-10-24 23:16:13.000000000 +0200 +++ tryton-modules-party-vcarddav-2.2.1/PKG-INFO 2012-09-02 16:23:13.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: trytond_party_vcarddav -Version: 2.2.0 +Version: 2.2.1 Summary: Add CardDAV on parties Home-page: http://www.tryton.org/ Author: B2CK diff -Nru tryton-modules-party-vcarddav-2.2.0/trytond_party_vcarddav.egg-info/PKG-INFO tryton-modules-party-vcarddav-2.2.1/trytond_party_vcarddav.egg-info/PKG-INFO --- tryton-modules-party-vcarddav-2.2.0/trytond_party_vcarddav.egg-info/PKG-INFO 2011-10-24 23:16:13.000000000 +0200 +++ tryton-modules-party-vcarddav-2.2.1/trytond_party_vcarddav.egg-info/PKG-INFO 2012-09-02 16:23:12.000000000 +0200 @@ -1,6 +1,6 @@ Metadata-Version: 1.0 Name: trytond-party-vcarddav -Version: 2.2.0 +Version: 2.2.1 Summary: Add CardDAV on parties Home-page: http://www.tryton.org/ Author: B2CK diff -Nru tryton-modules-party-vcarddav-2.2.0/__tryton__.py tryton-modules-party-vcarddav-2.2.1/__tryton__.py --- tryton-modules-party-vcarddav-2.2.0/__tryton__.py 2011-10-24 23:16:06.000000000 +0200 +++ tryton-modules-party-vcarddav-2.2.1/__tryton__.py 2011-10-24 23:17:55.000000000 +0200 @@ -8,7 +8,7 @@ 'name_es_CO' : 'vCardDAV de CompañÃa', 'name_es_ES' : 'Tercero - vCardDAV', 'name_fr_FR': 'Tiers - vCardDAV', - 'version' : '2.2.0', + 'version' : '2.2.1', 'author' : 'B2CK', 'email': 'i...@b2ck.com', 'website': 'http://www.tryton.org/', diff -Nru tryton-modules-party-vcarddav-2.2.0/webdav.py tryton-modules-party-vcarddav-2.2.1/webdav.py --- tryton-modules-party-vcarddav-2.2.0/webdav.py 2011-07-06 09:56:51.000000000 +0200 +++ tryton-modules-party-vcarddav-2.2.1/webdav.py 2012-06-19 22:28:17.000000000 +0200 @@ -1,6 +1,5 @@ #This file is part of Tryton. The COPYRIGHT file at the top level of #this repository contains the full copyright notices and license terms. -import base64 import urlparse from DAV.errors import DAV_NotFound, DAV_Forbidden from trytond.model import ModelView, ModelSQL @@ -254,7 +253,7 @@ val = vcard_obj.execute([party_id], {'id': party_id, 'ids': [party_id]}, ) - return base64.decodestring(val[1]) + return val[1] return super(Collection, self).get_data(uri, cache=cache) def get_address_data(self, uri, cache=None): @@ -262,11 +261,9 @@ party_id = self.vcard(uri) if not party_id: raise DAV_NotFound - val = vcard_obj.execute([party_id], - {'id': party_id, 'ids': [party_id]}, - ) - res = base64.decodestring(val[1]) - return res.decode('utf-8') + return vcard_obj.execute([party_id], + {'id': party_id, 'ids': [party_id]}, + ).decode('utf-8') def put(self, uri, data, content_type, cache=None): import vobjectsignature.asc
Description: PGP signature
--- End Message ---
--- Begin Message ---On Mon, 2012-10-08 at 10:12 +0200, Mathias Behrle wrote: > * Betr.: " Re: Bug#687695: pre-approve unblock: > tryton-modules-party-vcarddav/2.2.1-1" (Wed, 03 Oct 2012 19:06:22 +0100): > > Please go ahead, and let us know once the package has been in unstable > > for a few days. > > Package was uploaded to unstable on 2012-10-05. Unblocked. Regards, Adam
--- End Message ---