[git-buildpackage] [PATCH 3/3] git-pbuilder: correct env instructions with gbp

[Guido Günther]

Sorry for the duplicate, this time with the ML on cc:

On Mon, Nov 30, 2015 at 03:24:11PM -0700, Ken Dreyer wrote:
> The git-pbuilder man page says that git-buildpackage passes environment
> variables through to git-pbuilder. This may have been true long ago, but
> it's not true today.  git-buildpackage overrides several environment
> variables according to various --git-* options. Describe these and point
> to the git-buildpackage manpage for more information.
> ---
>  bin/git-pbuilder | 8 +++++---
>  1 file changed, 5 insertions(+), 3 deletions(-)
> 
> diff --git a/bin/git-pbuilder b/bin/git-pbuilder
> index b7db36c..2eb84cb 100644
> --- a/bin/git-pbuilder
> +++ b/bin/git-pbuilder
> @@ -404,9 +404,11 @@ B<git-buildpackage> to use it, add a stanza like:
>  
>  in your F<gbp.conf> file (which can be F<.gbp.conf> in your home directory
>  or at the top level of the repository, or F<gbp.conf> in the F<.git>
> -directory).  DIST and ARCH are read as an environment variable so that you
> -can set it before running B<git-buildpackage> without having to worry
> -about passing parameters through B<git-buildpackage>.
> +directory).  B<git-buildpackage> ignores the environment's DIST, ARCH, BUILDER,
> +GIT_PBUILDER_AUTOCONF, and GIT_PBUILDER_OPTIONS variables.  Use the
> +B<git-buildpackage> command-line arguments instead: B<--git-dist>,
> +B<--git-arch>, B<--git-qemubuilder>, B<--git-pbuilder-autoconf>, and
> +B<--git-pbuilder-options>.  See the B<git-buildpackage> manpage for details.

This is true if you use --git-pbuilder however if you use
--git-builder=git-pbuiler then the environment is left untouched so
maybe this should read:

  B<git-buildpackage> overwrites the environment's DIST, ARCH, BUILDER,
  ... options when used with B<--git-pbuilder> with the corresponding
  values from the command line and configuration files like ...
  <list of options as above>

Does this make sense?
Cheers,
 -- Guido


>  
>  Alternately, B<git-pbuilder> may be called with an argument of C<update>,
>  C<create>, or C<login>.  In this case, it calls B<cowbuilder> (or the
> -- 
> 2.4.3
>