rpms/python-rpm-generators
7
0
Fork 0
Code Issues Pull Requests Releases Activity

"Fix" support of environment markers

Browse Source 
Signed-off-by: Igor Gnatenko <ignatenkobrain@fedoraproject.org>
This commit is contained in:
Igor Gnatenko 2018-02-11 00:32:23 +01:00
parent b3ca5d8622
commit 5aa670bb39
No known key found for this signature in database
GPG Key ID: 695714BD1BBC5F4C
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python-rpm-generators.spec
View File

@ -47,6 +47,7 @@ install -Dpm0755 -t %{buildroot}%{_rpmconfigdir} pythondeps.sh pythondistdeps.py
%changelog %changelog
* Sun Feb 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5-1 * Sun Feb 11 2018 Igor Gnatenko <ignatenkobrain@fedoraproject.org> - 5-1
- Fork upstream generators - Fork upstream generators
- "Fix" support of environment markers
* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.0-2.1 * Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 4.14.0-2.1
- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild

5
pythondistdeps.py
View File

@ -122,6 +122,11 @@ for f in files:
else: else:
warn("Version for {!r} has not been found".format(dist), RuntimeWarning) warn("Version for {!r} has not been found".format(dist), RuntimeWarning)
continue continue
# XXX: https://github.com/pypa/setuptools/pull/1275
import platform
platform.python_version = lambda: dist.py_version
if Provides_PyMajorVer_Variant or PyMajorVer_Deps or legacy_Provides or legacy: if Provides_PyMajorVer_Variant or PyMajorVer_Deps or legacy_Provides or legacy:
# Get the Python major version # Get the Python major version
pyver_major = dist.py_version.split('.')[0] pyver_major = dist.py_version.split('.')[0]