From 332263fd9ffa956e53802da7e4240f1f7f22134b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jelmer=20Vernoo=C4=B3?= Date: Mon, 29 Mar 2021 01:06:01 +0100 Subject: [PATCH] Run gbp dch when not updating changelog. --- ognibuild/debian/build.py | 3 +++ ognibuild/debian/fix_build.py | 1 + 2 files changed, 4 insertions(+) diff --git a/ognibuild/debian/build.py b/ognibuild/debian/build.py index e530cf2..505199c 100644 --- a/ognibuild/debian/build.py +++ b/ognibuild/debian/build.py @@ -222,6 +222,7 @@ def attempt_build( build_changelog_entry=None, subpath="", source_date_epoch=None, + run_gbp_dch=False ): """Attempt a build, with a custom distribution set. @@ -236,6 +237,8 @@ def attempt_build( source_date_epoch: Source date epoch to set Returns: Tuple with (changes_name, cl_version) """ + if run_gbp_dch: + gbp_dch(local_tree.abspath(subpath)) if build_changelog_entry is not None: add_dummy_changelog_entry( local_tree, subpath, suffix, build_suite, build_changelog_entry diff --git a/ognibuild/debian/fix_build.py b/ognibuild/debian/fix_build.py index 5e12726..2ae4487 100644 --- a/ognibuild/debian/fix_build.py +++ b/ognibuild/debian/fix_build.py @@ -530,6 +530,7 @@ def build_incrementally( build_changelog_entry, subpath=subpath, source_date_epoch=source_date_epoch, + run_gbp_dch=(update_changelog is False) ) except SbuildFailure as e: if e.error is None: