From 417b62d0718a697a338878b2ec721a49b378368b Mon Sep 17 00:00:00 2001 From: Lars Wirzenius Date: Sun, 12 Aug 2018 11:33:27 +0300 Subject: Change: use setup.py only for tag name checking --- ick_helpers.py | 10 +++------- 1 file 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) -- cgit v1.2.1