aboutsummaryrefslogtreecommitdiffstats
path: root/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb
diff options
context:
space:
mode:
authorleimaohui <leimaohui@cn.fujitsu.com>2018-05-27 17:34:16 -0700
committerArmin Kuster <akuster808@gmail.com>2018-08-19 07:19:58 -0700
commit7825bc0ed57c5da0fafd260b5e81346410582e33 (patch)
treeeb685d8d6ea86d717419a2d307ce00c1415c3e01 /meta-python/recipes-devtools/python/python-pytest_3.4.2.bb
parent4504d2e78d544ef649dede6148675cef3ca500e3 (diff)
downloadmeta-openembedded-7825bc0ed57c5da0fafd260b5e81346410582e33.tar.gz
meta-openembedded-7825bc0ed57c5da0fafd260b5e81346410582e33.tar.bz2
meta-openembedded-7825bc0ed57c5da0fafd260b5e81346410582e33.zip
python-pytest: Fix conflict error as following:
file /usr/bin/py.test conflicts between attempted installs of python3-pytest-3.4.2-r0 and python-pytest-3.4.2-r0 file /usr/bin/pytest conflicts between attempted installs of python3-pytest-3.4.2-r0 and python-pytest-3.4.2-r0 Signed-off-by: Lei Maohui <leimaohui@cn.fujitsu.com> Signed-off-by: Khem Raj <raj.khem@gmail.com> (cherry picked from commit 28fab4c8f547d45b80bb7b06d33a6c6c1ea74efc) Signed-off-by: Armin Kuster <akuster808@gmail.com>
Diffstat (limited to 'meta-python/recipes-devtools/python/python-pytest_3.4.2.bb')
-rw-r--r--meta-python/recipes-devtools/python/python-pytest_3.4.2.bb1
1 files changed, 1 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb b/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb
index 201ab050c..39e50aca9 100644
--- a/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb
+++ b/meta-python/recipes-devtools/python/python-pytest_3.4.2.bb
@@ -6,3 +6,4 @@ RDEPENDS_${PN}_class-target += " \
${PYTHON_PN}-compiler \
${PYTHON_PN}-funcsigs \
"
+ALTERNATIVE_PRIORITY = "10"