diff options
author | leimaohui <leimaohui@cn.fujitsu.com> | 2018-05-27 17:34:16 -0700 |
---|---|---|
committer | Armin Kuster <akuster808@gmail.com> | 2018-08-19 07:19:58 -0700 |
commit | 7825bc0ed57c5da0fafd260b5e81346410582e33 (patch) | |
tree | eb685d8d6ea86d717419a2d307ce00c1415c3e01 /meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb | |
parent | 4504d2e78d544ef649dede6148675cef3ca500e3 (diff) | |
download | meta-openembedded-7825bc0ed57c5da0fafd260b5e81346410582e33.tar.gz |
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/python3-pytest_3.4.2.bb')
-rw-r--r-- | meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb b/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb index 466cfa8253..eba6632a27 100644 --- a/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb +++ b/meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb @@ -1,2 +1,4 @@ inherit pypi setuptools3 require python-pytest.inc + +ALTERNATIVE_PRIORITY = "100" |