diff options
| author | leimaohui <leimaohui@cn.fujitsu.com> | 2018-05-27 17:34:16 -0700 |
|---|---|---|
| committer | Khem Raj <raj.khem@gmail.com> | 2018-06-20 10:07:41 -0700 |
| commit | 28fab4c8f547d45b80bb7b06d33a6c6c1ea74efc (patch) | |
| tree | adcf32bc96199c3e01f01bfabfa6766082ef064a /meta-python/recipes-devtools/python/python3-pytest_3.4.2.bb | |
| parent | a5ea75f5161950fb204852d1a1ddfb4acd5a720e (diff) | |
| download | meta-openembedded-28fab4c8f547d45b80bb7b06d33a6c6c1ea74efc.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>
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 @@ | |||
| 1 | inherit pypi setuptools3 | 1 | inherit pypi setuptools3 |
| 2 | require python-pytest.inc | 2 | require python-pytest.inc |
| 3 | |||
| 4 | ALTERNATIVE_PRIORITY = "100" | ||