openstack/renderspec
Code Issues Proposed changes

Merge "Check version length in py2rpmversion() for Fedora"

Browse Source
This commit is contained in:
Jenkins 2016-12-19 16:01:09 +00:00 committed by Gerrit Code Review
commit 32ebb11f94
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
renderspec/__init__.py
View File

@ -58,7 +58,10 @@ def _context_py2rpmversion(context):
# and Release # and Release
# https://fedoraproject.org/wiki/Packaging:Versioning\#Pre-Release_packages # https://fedoraproject.org/wiki/Packaging:Versioning\#Pre-Release_packages
if context['spec_style'] == 'fedora': if context['spec_style'] == 'fedora':
return v_python.base_version if len(v_python._version.release) >= 4:
return "%d.%d.%d" % (v_python._version.release[0:3])
else:
return v_python.base_version
else: else:
v_rpm = v_python.public v_rpm = v_python.public
if v_python.is_prerelease: if v_python.is_prerelease:

2
tests.py
View File

@ -197,6 +197,7 @@ class RenderspecTemplateFunctionTests(unittest.TestCase):
('fedora', '1.1.0', '1.1.0'), ('fedora', '1.1.0', '1.1.0'),
('fedora', '1.1.0b10', '1.1.0'), ('fedora', '1.1.0b10', '1.1.0'),
('fedora', '1.1.0rc2dev2', '1.1.0'), ('fedora', '1.1.0rc2dev2', '1.1.0'),
('fedora', '11.0.0.0b1', '11.0.0'),
) )
@unpack @unpack
def test_render_func_py2rpmversion(self, style, py_ver, rpm_ver): def test_render_func_py2rpmversion(self, style, py_ver, rpm_ver):
@ -221,6 +222,7 @@ class RenderspecTemplateFunctionTests(unittest.TestCase):
('fedora', '1.1.0b10', '1', '0.1.b10%{?dist}'), ('fedora', '1.1.0b10', '1', '0.1.b10%{?dist}'),
('fedora', '1.1.0rc2', '5', '0.5.rc2%{?dist}'), ('fedora', '1.1.0rc2', '5', '0.5.rc2%{?dist}'),
('fedora', '1.1.0rc2dev2', '1', '0.1.rc2.dev2%{?dist}'), ('fedora', '1.1.0rc2dev2', '1', '0.1.rc2.dev2%{?dist}'),
('fedora', '11.0.0.0b1', '1', '0.1.b1%{?dist}'),
) )
@unpack @unpack
def test_render_func_py2rpmrelease(self, style, upstream_ver, rpm_release, def test_render_func_py2rpmrelease(self, style, upstream_ver, rpm_release,