[oe-commits] [meta-openembedded] 09/13: python-pycodestyle: Fix conflict error with python3-pycodestyle during do_rootfs

[git at git.openembedded.org]

This is an automated email from the git hooks/post-receive script.

khem pushed a commit to branch master-next
in repository meta-openembedded.

commit 95f1e9378c1483dcf3771c0265b98926c1056db0
Author: leimaohui <leimaohui at cn.fujitsu.com>
AuthorDate: Tue Apr 16 15:42:24 2019 +0800

    python-pycodestyle: Fix conflict error with python3-pycodestyle during do_rootfs
    
    Signed-off-by: Lei Maohui <leimaohui at cn.fujitsu.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-python/recipes-devtools/python/python-pycodestyle_2.4.0.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-python/recipes-devtools/python/python-pycodestyle_2.4.0.bb b/meta-python/recipes-devtools/python/python-pycodestyle_2.4.0.bb
index 7c736e7..ec6c12f 100644
--- a/meta-python/recipes-devtools/python/python-pycodestyle_2.4.0.bb
+++ b/meta-python/recipes-devtools/python/python-pycodestyle_2.4.0.bb
@@ -2,3 +2,9 @@ inherit setuptools
 require python-pycodestyle.inc
 
 RDEPENDS_${PN} += "${PYTHON_PN}-lang"
+
+do_install_append () {
+        if [ -f ${D}${bindir}/pycodestyle ]; then
+                mv ${D}${bindir}/pycodestyle ${D}${bindir}/pycodestyle-2
+        fi
+}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.