From 52b2ad41fe7b6d6c9b80c6ce0e9c9cf89ece4936 Mon Sep 17 00:00:00 2001
From: leimaohui <leimaohui@cn.fujitsu.com>
Date: Mon, 15 Apr 2019 13:57:13 +0800
Subject: To fix confilict error with python3-pbr.

(From meta-openembedded commit: cb224dcd7f7a24ffd802a206f3f453850d7a1328)

Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com>
Signed-off-by: Khem Raj <raj.khem@gmail.com>
Signed-off-by: Tim Orling <ticotimo@gmail.com>
---
 recipes-devtools/python/python-pbr_4.2.0.bb | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/recipes-devtools/python/python-pbr_4.2.0.bb b/recipes-devtools/python/python-pbr_4.2.0.bb
index 3248772..361f2a4 100644
--- a/recipes-devtools/python/python-pbr_4.2.0.bb
+++ b/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
+}
+
-- 
cgit 1.2.3-korg