mirror of
https://github.com/openembedded/meta-openembedded.git
synced 2025-07-19 15:29:08 +02:00
aaee985fb5
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>
28 lines
778 B
Diff
28 lines
778 B
Diff
From 03bd5cb77c54033857810bb17562859eefa41221 Mon Sep 17 00:00:00 2001
|
|
From: Simon Busch <simon.busch@lge.com>
|
|
Date: Wed, 9 Apr 2014 13:20:33 +0200
|
|
Subject: [PATCH] Add possibility to import templates from packages
|
|
|
|
Does not have any unit tests yet.
|
|
|
|
Signed-off-by: Simon Busch <simon.busch@lge.com>
|
|
|
|
---
|
|
dbusmock/mockobject.py | 3 +++
|
|
1 file changed, 3 insertions(+)
|
|
|
|
diff --git a/dbusmock/mockobject.py b/dbusmock/mockobject.py
|
|
index e4f130f..389df70 100644
|
|
--- a/dbusmock/mockobject.py
|
|
+++ b/dbusmock/mockobject.py
|
|
@@ -46,6 +46,9 @@ def load_module(name):
|
|
exec(f.read(), mod.__dict__, mod.__dict__)
|
|
return mod
|
|
|
|
+ if '.' in name:
|
|
+ return importlib.import_module(name)
|
|
+
|
|
return importlib.import_module('dbusmock.templates.' + name)
|
|
|
|
|