summaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
diff options
context:
space:
mode:
authorArmin Kuster <akuster808@gmail.com>2018-04-07 15:08:08 -0700
committerArmin Kuster <akuster808@gmail.com>2018-04-13 12:43:39 -0700
commitaaee985fb5acd4fe6dc818053e2a05e6a065cd10 (patch)
tree725a90c01bb379361d9a77ae5a4f5c7366c6b532 /meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
parenteda0d3ecb3cde4ac57d418622b26865eb364af0c (diff)
downloadmeta-openembedded-aaee985fb5acd4fe6dc818053e2a05e6a065cd10.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 Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch')
-rw-r--r--meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch18
1 files changed, 8 insertions, 10 deletions
diff --git a/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch b/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
index 981694f0e8..06ab1f05e2 100644
--- a/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
+++ b/meta-python/recipes-devtools/python/python-dbusmock/0002-Add-possibility-to-import-templates-from-packages.patch
@@ -1,22 +1,23 @@
1From ff1dffd5673bcd2cbd9554ad62476d108dbc18af Mon Sep 17 00:00:00 2001 1From 03bd5cb77c54033857810bb17562859eefa41221 Mon Sep 17 00:00:00 2001
2From: Simon Busch <simon.busch@lge.com> 2From: Simon Busch <simon.busch@lge.com>
3Date: Wed, 9 Apr 2014 13:20:33 +0200 3Date: Wed, 9 Apr 2014 13:20:33 +0200
4Subject: [PATCH 2/2] Add possibility to import templates from packages 4Subject: [PATCH] Add possibility to import templates from packages
5 5
6Does not have any unit tests yet. 6Does not have any unit tests yet.
7 7
8Signed-off-by: Simon Busch <simon.busch@lge.com> 8Signed-off-by: Simon Busch <simon.busch@lge.com>
9
9--- 10---
10 dbusmock/mockobject.py | 3 +++ 11 dbusmock/mockobject.py | 3 +++
11 1 file changed, 3 insertions(+) 12 1 file changed, 3 insertions(+)
12 13
13diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py 14diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py
14index a98e03d..9530c2a 100644 15index e4f130f..389df70 100644
15--- a/dbusmock/mockobject.py 16--- a/dbusmock/mockobject.py
16+++ b/dbusmock/mockobject.py 17+++ b/dbusmock/mockobject.py
17@@ -49,6 +49,9 @@ def load_module(name): 18@@ -46,6 +46,9 @@ def load_module(name):
18 19 exec(f.read(), mod.__dict__, mod.__dict__)
19 return module 20 return mod
20 21
21+ if '.' in name: 22+ if '.' in name:
22+ return importlib.import_module(name) 23+ return importlib.import_module(name)
@@ -24,6 +25,3 @@ index a98e03d..9530c2a 100644
24 return importlib.import_module('dbusmock.templates.' + name) 25 return importlib.import_module('dbusmock.templates.' + name)
25 26
26 27
27--
281.7.9.5
29