summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLars Wirzenius <liw@liw.fi>2018-08-12 11:33:27 +0300
committerLars Wirzenius <liw@liw.fi>2018-08-12 11:33:27 +0300
commit417b62d0718a697a338878b2ec721a49b378368b (patch)
tree58a557b7c19286f95e91649cbe1bab299ab1ae8f
parent9e1cc6eebf0e7a3a5bae19cbd91702bb3d947522 (diff)
downloadick-helpers-417b62d0718a697a338878b2ec721a49b378368b.tar.gz
Change: use setup.py only for tag name checking
-rw-r--r--ick_helpers.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/ick_helpers.py b/ick_helpers.py
index e62134d..99a52a8 100644
--- a/ick_helpers.py
+++ b/ick_helpers.py
@@ -83,7 +83,7 @@ class Exec:
debug('seems to be a release tag:', tag)
return True
- def get_debian_source_package(self):
+ def get_project_name(self):
setup_py = os.path.join(self.dirname, 'setup.py')
if os.path.exists(setup_py):
output = self.get_stdout('python', 'setup.py', '--name')
@@ -200,11 +200,7 @@ class DebianReleaseBuilder:
return tarball
def get_source_package(self):
- setup_py = os.path.join(self.ex.dirname, 'setup.py')
- if os.path.exists(setup_py):
- output = self.ex.get_stdout('python', 'setup.py', '--name')
- else:
- output = self.ex.get_stdout('dpkg-parsechangelog', '-S', 'Source')
+ output = self.ex.get_stdout('dpkg-parsechangelog', '-S', 'Source')
return output.strip()
def get_version(self):
@@ -290,7 +286,7 @@ def build_debian_releases(params, resultsdir):
dirnames = find_upstream_dirs(sources)
for dirname in dirnames:
ex = Exec(dirname)
- project = ex.get_debian_source_package()
+ project = ex.get_project_name()
tags = ex.find_release_tags(project)
debug('release tags:', tags)
builder = DebianReleaseBuilder(ex, resultsdir, debfullname, debemail)