[oe-commits] [meta-openembedded] 08/13: python(3)-ndg-httpsclient: use update-alternatives to avoid do_rootfs failure

[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 892948980c153ff21f7863115b4a51c8f0f194d2
Author: Qi.Chen at windriver.com <Qi.Chen at windriver.com>
AuthorDate: Fri Sep 14 09:51:44 2018 +0800

    python(3)-ndg-httpsclient: use update-alternatives to avoid do_rootfs failure
    
    Use update-alternaives to manage /usr/bin/ndg_httpclient to avoid the following
    do_rootfs failure.
    
    Error: Transaction check error:
      file /usr/bin/ndg_httpclient conflicts between attempted installs of python-ndg-httpsclient-0.5.1-r0.core2_64 and python3-ndg-httpsclient-0.5.1-r0.core2_64
    
    Signed-off-by: Chen Qi <Qi.Chen at windriver.com>
    Signed-off-by: Khem Raj <raj.khem at gmail.com>
---
 meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.1.bb | 6 +++++-
 .../recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb        | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.1.bb b/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.1.bb
index ca0eb32..9cd881a 100644
--- a/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.1.bb
+++ b/meta-python/recipes-devtools/python/python-ndg-httpsclient_0.5.1.bb
@@ -1,2 +1,6 @@
 require python-ndg-httpsclient.inc
-inherit pypi setuptools
+inherit pypi setuptools update-alternatives
+
+ALTERNATIVE_${PN} = "ndg_httpclient"
+ALTERNATIVE_LINK_NAME[ndg_httpclient] = "${bindir}/ndg_httpclient"
+ALTERNATIVE_PRIORITY = "20"
diff --git a/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb b/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb
index 3f07b2e..65a8c81 100644
--- a/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb
+++ b/meta-python/recipes-devtools/python/python3-ndg-httpsclient_0.5.1.bb
@@ -1,2 +1,6 @@
-inherit pypi setuptools3
+inherit pypi setuptools3 update-alternatives
 require python-ndg-httpsclient.inc
+
+ALTERNATIVE_${PN} = "ndg_httpclient"
+ALTERNATIVE_LINK_NAME[ndg_httpclient] = "${bindir}/ndg_httpclient"
+ALTERNATIVE_PRIORITY = "30"

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