[git-buildpackage] [PATCH 3/3] gbp-buildpackage-rpm: superfluous options test

[Guido Günther]

On Sat, Jul 09, 2016 at 05:44:05PM +0200, tzafrir at debian.org wrote:
> From: Tzafrir Cohen <tzafrir at debian.org>
> 
> Remove a superfluous test for options.use_mock: already tested before
> calling to setup_mock().
> 
> Signed-off-by: Tzafrir Cohen <tzafrir at debian.org>
> ---
>  gbp/scripts/buildpackage_rpm.py | 17 ++++++++---------
>  1 file changed, 8 insertions(+), 9 deletions(-)
> 
> diff --git a/gbp/scripts/buildpackage_rpm.py b/gbp/scripts/buildpackage_rpm.py
> index 7cd39e6..ca7ca23 100644
> --- a/gbp/scripts/buildpackage_rpm.py
> +++ b/gbp/scripts/buildpackage_rpm.py
> @@ -281,15 +281,14 @@ def packaging_tag_data(repo, commit, name, version, options):
>  
>  def setup_mock(options):
>      """setup everything to use gbp-builder-mock"""
> -    if options.use_mock:
> -        options.builder = '/usr/share/git-buildpackage/gbp-builder-mock'
> -        options.cleaner = '/bin/true'
> -        os.environ['GBP_BUILDER_MOCK_DIST'] = options.mock_dist
> -        if options.mock_arch:
> -            os.environ['GBP_BUILDER_MOCK_ARCH'] = options.mock_arch
> -        if options.mock_root:
> -            os.environ['GBP_BUILDER_MOCK_ROOT'] = options.mock_root
> -        os.environ['GBP_BUILDER_MOCK_EXPORT_DIR'] = options.export_dir
> +    options.builder = '/usr/share/git-buildpackage/gbp-builder-mock'
> +    options.cleaner = '/bin/true'
> +    os.environ['GBP_BUILDER_MOCK_DIST'] = options.mock_dist
> +    if options.mock_arch:
> +        os.environ['GBP_BUILDER_MOCK_ARCH'] = options.mock_arch
> +    if options.mock_root:
> +        os.environ['GBP_BUILDER_MOCK_ROOT'] = options.mock_root
> +    os.environ['GBP_BUILDER_MOCK_EXPORT_DIR'] = options.export_dir

Looks good but currently does not apply. Will gladly merge once you've respun
the series.
Cheers and thanks for looking into this!
 -- Guido