From 0bdde4947d07eee744ec4d676e041581d26660e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 26 May 2021 19:43:46 +0100 Subject: [PATCH 1/2] Return changelog entry. --- ognibuild/debian/build.py | 8 ++++---- ognibuild/debian/fix_build.py | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/ognibuild/debian/build.py b/ognibuild/debian/build.py index 189b0ae..29d689e 100644 --- a/ognibuild/debian/build.py +++ b/ognibuild/debian/build.py @@ -157,7 +157,7 @@ def add_dummy_changelog_entry( editor[0].distributions = suite -def get_latest_changelog_version(local_tree, subpath=""): +def get_latest_changelog_entry(local_tree, subpath=""): if control_files_in_root(local_tree, subpath): path = os.path.join(subpath, "changelog") else: @@ -246,11 +246,11 @@ def build_once( retcode, shlex.split(build_command), [], sbuild_failure.description) - (cl_package, cl_version) = get_latest_changelog_version(local_tree, subpath) + cl_entry = get_latest_changelog_entry(local_tree, subpath) changes_names = [] - for kind, entry in find_changes_files(output_directory, cl_package, cl_version): + for kind, entry in find_changes_files(output_directory, cl_entry.package, cl_entry.version): changes_names.append((entry.name)) - return (changes_names, cl_version) + return (changes_names, cl_entry) def gbp_dch(path): diff --git a/ognibuild/debian/fix_build.py b/ognibuild/debian/fix_build.py index 1ef9b12..ffb064d 100644 --- a/ognibuild/debian/fix_build.py +++ b/ognibuild/debian/fix_build.py @@ -681,7 +681,7 @@ def main(argv=None): apt = AptManager(session) try: - (changes_filenames, cl_version) = build_incrementally( + (changes_filenames, cl_entry) = build_incrementally( tree, apt, args.suffix, @@ -714,7 +714,7 @@ def main(argv=None): logging.info( 'Built %s - changes file at %r.', - cl_version, changes_filenames) + cl_entry.version, changes_filenames) if __name__ == "__main__": From d1052da40436a8a670efe6021f02724419b7da9f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Wed, 26 May 2021 19:44:13 +0100 Subject: [PATCH 2/2] Release 0.0.7. --- ognibuild/__init__.py | 2 +- setup.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ognibuild/__init__.py b/ognibuild/__init__.py index 82408b8..22dfaec 100644 --- a/ognibuild/__init__.py +++ b/ognibuild/__init__.py @@ -20,7 +20,7 @@ import os import stat -__version__ = (0, 0, 6) +__version__ = (0, 0, 7) USER_AGENT = "Ognibuild" diff --git a/setup.py b/setup.py index 0be4ae0..8167aae 100755 --- a/setup.py +++ b/setup.py @@ -6,7 +6,7 @@ from setuptools import setup setup(name="ognibuild", description="Detect and run any build system", - version="0.0.6", + version="0.0.7", maintainer="Jelmer Vernooij", maintainer_email="jelmer@jelmer.uk", license="GNU GPLv2 or later",