From 22d40a42207162ed1f7ed1d640985bf2043f8db3 Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Fri, 1 Dec 2017 11:16:56 +0100 Subject: hooks: print hook name prior to execution This makes it simpler to identify build steps --- gbp/scripts/buildpackage.py | 1 + gbp/scripts/common/hook.py | 6 ++++++ 2 files changed, 7 insertions(+) diff --git a/gbp/scripts/buildpackage.py b/gbp/scripts/buildpackage.py index 26baabc2..ebf5a8a8 100755 --- a/gbp/scripts/buildpackage.py +++ b/gbp/scripts/buildpackage.py @@ -539,6 +539,7 @@ def main(argv): )(dir=build_dir) # Finally build the package: + gbp.log.info("Performing the build") RunAtCommand(options.builder, [pipes.quote(arg) for arg in dpkg_args], shell=True, diff --git a/gbp/scripts/common/hook.py b/gbp/scripts/common/hook.py index 7867b269..bcaf3cd9 100644 --- a/gbp/scripts/common/hook.py +++ b/gbp/scripts/common/hook.py @@ -17,14 +17,20 @@ """Common code for runniing hooks""" from gbp.command_wrappers import RunAtCommand +import gbp.log class Hook(RunAtCommand): "A hook run by one of the scripts" def __init__(self, name, cmd, extra_env): RunAtCommand.__init__(self, cmd, shell=True, extra_env=extra_env) + self.name = name self.run_error = '%s-hook %s' % (name, self.run_error) + def __call__(self, *args, **kwargs): + gbp.log.info("Running %s hook" % self.name) + return RunAtCommand.__call__(self, *args, **kwargs) + @staticmethod def md(a, b): "Merge two dictionaires a and b into a new one" -- cgit v1.2.3