[oe-commits] [meta-openembedded] 03/16: To fix confilict error with python3-pbr.

[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 cb224dcd7f7a24ffd802a206f3f453850d7a1328
Author: leimaohui <leimaohui at cn.fujitsu.com>
AuthorDate: Mon Apr 15 13:57:13 2019 +0800

    To fix confilict error with python3-pbr.
    
    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-pbr_4.2.0.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb b/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb
index 3248772..361f2a4 100644
--- a/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb
+++ b/meta-python/recipes-devtools/python/python-pbr_4.2.0.bb
@@ -5,3 +5,9 @@ require recipes-devtools/python/python-pbr.inc
 SRC_URI[md5sum] = "6619780896ca81c7cd19c6e2f439b6c9"
 SRC_URI[sha256sum] = "1b8be50d938c9bb75d0eaf7eda111eec1bf6dc88a62a6412e33bf077457e0f45"
 
+do_install_append() {
+        if [ -f ${D}${bindir}/pbr ]; then
+                mv ${D}${bindir}/pbr ${D}${bindir}/pbr-2
+        fi
+}
+

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