release-engineering/tito
1
0
Fork 0
mirror of https://github.com/rpm-software-management/tito.git synced 2025-02-23 20:22:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Don't append 'None' to Release line with no '%{?dist}' part

Browse source
This commit is contained in:
Patrice Fournier 2017-08-29 09:28:09 -04:00
parent 19d38ad203
commit 2a89594819
2 changed files with 18 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/tito/common.py
View file

@ -694,7 +694,7 @@ def munge_specfile(spec_file, commit_id, commit_count, fullname=None, tgz_filena
m.group(2), m.group(2),
commit_count, commit_count,
sha, sha,
m.group(3), m.group(3) or '',
)) ))
continue continue

17
test/unit/common_tests.py
View file

@ -389,6 +389,23 @@ class SpecTransformTest(unittest.TestCase):
self.assertEquals("%%setup -q -n %s\n" % fullname, output[1]) self.assertEquals("%%setup -q -n %s\n" % fullname, output[1])
def test_transform_no_dist_tag(self):
simple_spec = dedent("""
Release: 1
Source: hello-1.0.0.tar.gz
""")
with open(self.spec_file, 'w') as f:
f.write(simple_spec)
sha = "acecafe"
commit_count = 5
munge_specfile(self.spec_file, sha, commit_count)
output = open(self.spec_file, 'r').readlines()
self.assertEquals(3, len(output))
self.assertEquals("Release: 1.git.%s.%s\n" % (commit_count, sha), output[1])
self.assertEquals("Source: hello-1.0.0.tar.gz\n", output[2])
class VersionMathTest(unittest.TestCase): class VersionMathTest(unittest.TestCase):
def test_increase_version_minor(self): def test_increase_version_minor(self):