From 53290f9bd773e5bde0b141f2021f8acefc512719 Mon Sep 17 00:00:00 2001 From: Chris Johns Date: Thu, 14 Aug 2014 07:10:52 +1000 Subject: [PATCH] sb: Add a dry run footer to ereports. --- source-builder/sb/build.py | 8 +++++--- source-builder/sb/setbuilder.py | 1 - 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/source-builder/sb/build.py b/source-builder/sb/build.py index c8b49cc..42ff22c 100644 --- a/source-builder/sb/build.py +++ b/source-builder/sb/build.py @@ -109,8 +109,9 @@ class build: else: return name - def _generate_report_(self, header): - ereport.generate('rsb-report-%s.txt' % self.macros['name'], self.opts, header) + def _generate_report_(self, header, footer = None): + ereport.generate('rsb-report-%s.txt' % self.macros['name'], + self.opts, header, footer) def __init__(self, name, create_tar_files, opts, macros = None): try: @@ -443,7 +444,8 @@ class build: except: raise if self.opts.dry_run(): - self._generate_report_('Build: dry run') + self._generate_report_('Build: dry run (no actual error)', + 'Build: dry run (no actual error)') def name(self): packages = self.config.packages() diff --git a/source-builder/sb/setbuilder.py b/source-builder/sb/setbuilder.py index 6e7e7cc..1cdb094 100644 --- a/source-builder/sb/setbuilder.py +++ b/source-builder/sb/setbuilder.py @@ -33,7 +33,6 @@ try: import build import check import error - import ereport import log import mailer import options