diff options
| author |   Armin Kuster <akuster808@gmail.com> | 2018-04-07 15:08:08 -0700 |
|---|---|---|
| committer | Armin Kuster <akuster808@gmail.com> | 2018-04-13 12:43:39 -0700 |
| commit | cbfa53d6368aeaeb93bdc287d852b54f9ffd6af8 (patch) | |
| tree | 6a28427df97fef51da541d7977d21e70c8ffadaf /recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch | |
| parent | 47f4e742ce5a2f021a69f182d05806bf7368d861 (diff) | |
| download | meta-python2-cbfa53d6368aeaeb93bdc287d852b54f9ffd6af8.tar.gz | |
pyton-dbusmuck: refresh patches
WARNING:
Some of the context lines in patches were ignored. This can lead to incorrectly applied patches.
The context lines in the patches can be updated with devtool:
devtool modify <recipe>
devtool finish --force-patch-refresh <recipe> <layer_path>
Then the updated patches and the source tree (in devtool's workspace)
should be reviewed to make sure the patches apply in the correct place
and don't introduce duplicate lines (which can, and does happen
when some of the context is ignored). Further information:
http://lists.openembedded.org/pipermail/openembedded-core/2018-March/148675.html
https://bugzilla.yoctoproject.org/show_bug.cgi?id=10450
Details:
checking file dbusmock/__init__.py
Hunk #1 succeeded at 14 with fuzz 1.
checking file dbusmock/mockobject.py
Hunk #1 succeeded at 688 (offset 6 lines).
and others
(From meta-openembedded commit: aaee985fb5acd4fe6dc818053e2a05e6a065cd10)
Signed-off-by: Armin Kuster <akuster808@gmail.com>
Signed-off-by: Tim Orling <ticotimo@gmail.com>
Diffstat (limited to 'recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch')
| -rw-r--r-- | recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch | 21 |
1 files changed, 10 insertions, 11 deletions
diff --git a/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch b/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch index fdd00b6..c4d8178 100644 --- a/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch +++ b/recipes-devtools/python/python-dbusmock/0001-Add-functionality-to-add-own-objects-to-internal-obj.patch @@ -1,7 +1,8 @@ -From eebe0f66435c4d821b0f5f93f69efe17b4a384c2 Mon Sep 17 00:00:00 2001 +From c4436fd42f2936e5fb0f95434d06e45aa9959ca0 Mon Sep 17 00:00:00 2001 From: Simon Busch <simon.busch@lge.com> Date: Wed, 9 Apr 2014 13:18:33 +0200 -Subject: [PATCH 1/2] Add functionality to add own objects to internal object +Subject: [PATCH] Add functionality to add own objects to internal object + list In some case the tests might want to create dynamically dbus objects which extended @@ -9,17 +10,18 @@ functionality from own class definitions within templates. In such cases we need register those objects with the internal object manager of dbusmock. Signed-off-by: Simon Busch <simon.busch@lge.com> + --- - dbusmock/__init__.py | 4 ++-- - dbusmock/mockobject.py | 8 ++++++++ + dbusmock/__init__.py | 4 ++-- + dbusmock/mockobject.py | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/dbusmock/__init__.py b/dbusmock/__init__.py -index f799cc7..6718c06 100644 +index 8a482ab..3d5d71a 100644 --- a/dbusmock/__init__.py +++ b/dbusmock/__init__.py @@ -14,8 +14,8 @@ __license__ = 'LGPL 3+' - __version__ = '0.10.1' + __version__ = '0.16.7' from dbusmock.mockobject import (DBusMockObject, MOCK_IFACE, - OBJECT_MANAGER_IFACE, get_object, get_objects) @@ -30,10 +32,10 @@ index f799cc7..6718c06 100644 - 'DBusTestCase', 'get_object', 'get_objects'] + 'DBusTestCase', 'get_object', 'get_objects', 'add_object'] diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py -index 97b79ce..a98e03d 100644 +index 586dbad..e4f130f 100644 --- a/dbusmock/mockobject.py +++ b/dbusmock/mockobject.py -@@ -682,6 +682,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup +@@ -688,6 +688,14 @@ dbus.service._method_lookup = _dbusmock_method_lookup # Helper API for templates # @@ -48,6 +50,3 @@ index 97b79ce..a98e03d 100644 def get_objects(): '''Return all existing object paths''' --- -1.7.9.5 - |