Date: Tuesday, October 25, 2022 @ 18:03:54
Author: heftig
Revision: 458947
0.28.6-2: fix folks
Added:
python-dbusmock/trunk/0001-Fix-OBEX-PullAll-after-pathlib-conversion.patch
Modified:
python-dbusmock/trunk/PKGBUILD
------------------------------------------------------+
0001-Fix-OBEX-PullAll-after-pathlib-conversion.patch | 36 +++++++++++++++++
PKGBUILD | 16 ++++++-
2 files changed, 49 insertions(+), 3 deletions(-)
Added: 0001-Fix-OBEX-PullAll-after-pathlib-conversion.patch
===================================================================
--- 0001-Fix-OBEX-PullAll-after-pathlib-conversion.patch
(rev 0)
+++ 0001-Fix-OBEX-PullAll-after-pathlib-conversion.patch 2022-10-25
18:03:54 UTC (rev 458947)
@@ -0,0 +1,36 @@
+From 0000000000000000000000000000000000000000 Mon Sep 17 00:00:00 2001
+From: "Jan Alexander Steffens (heftig)" <[email protected]>
+Date: Tue, 25 Oct 2022 17:39:54 +0000
+Subject: [PATCH] Fix OBEX PullAll after pathlib conversion
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+The OBEX tests in folks fail with:
+
+ (/build/folks/src/build/tests/bluez/bluez-individual-retrieval:3488):
+ folks-WARNING **: 17:30:47.981:
+ Error preparing persona store ‘bluez:00:00:00:00:00:00’:
+ The OBEX address book transfer from device ‘My Phone’ failed:
+ GDBus.Error:org.freedesktop.DBus.Error.InvalidArgs:
+ Invalid arguments: Expected a string or unicode object
+
+`PullAll` passes a `pathlib.Path` to `manager.EmitSignal`. Converting it
+to a `str` fixes the issue.
+---
+ dbusmock/templates/bluez5-obex.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/dbusmock/templates/bluez5-obex.py
b/dbusmock/templates/bluez5-obex.py
+index 880e05d65b0a..afc90538d9ea 100644
+--- a/dbusmock/templates/bluez5-obex.py
++++ b/dbusmock/templates/bluez5-obex.py
+@@ -225,7 +225,7 @@ def PullAll(self, target_file, filters):
+
+ # Emit a behind-the-scenes signal that a new transfer has been created.
+ manager.EmitSignal(OBEX_MOCK_IFACE, 'TransferCreated', 'sa{sv}s',
+- [transfer_path, filters, filename])
++ [transfer_path, filters, str(filename)])
+
+ return (transfer_path, props)
+
Modified: PKGBUILD
===================================================================
--- PKGBUILD 2022-10-25 17:16:17 UTC (rev 458946)
+++ PKGBUILD 2022-10-25 18:03:54 UTC (rev 458947)
@@ -2,7 +2,7 @@
pkgname=python-dbusmock
pkgver=0.28.6
-pkgrel=1
+pkgrel=2
pkgdesc="Mock D-Bus objects for tests"
url="https://github.com/martinpitt/python-dbusmock";
arch=(any)
@@ -10,14 +10,24 @@
depends=(python-dbus python-gobject)
makedepends=(python-setuptools python-setuptools-scm git)
_commit=276f54de0f653e8a37b0d0392450df3f57b0a746 # tags/0.28.6^0
-source=("git+https://github.com/martinpitt/python-dbusmock#commit=$_commit";)
-sha256sums=('SKIP')
+source=("git+https://github.com/martinpitt/python-dbusmock#commit=$_commit";
+ 0001-Fix-OBEX-PullAll-after-pathlib-conversion.patch)
+sha256sums=('SKIP'
+ 'd259cbecb464ad5ea782f43ca630062ffa03feb6017825a3b7ac235d910ba798')
+# Suppress local version
+export SETUPTOOLS_SCM_PRETEND_VERSION="${pkgver%%+*}"
+
pkgver() {
cd $pkgname
git describe --tags | sed 's/[^-]*-g/r&/;s/-/+/g'
}
+prepare() {
+ cd $pkgname
+ git apply -3 ../0001-Fix-OBEX-PullAll-after-pathlib-conversion.patch
+}
+
build() {
cd $pkgname
python setup.py build
