[elbe-devel] [PATCH v3] pbuilder-profiles: add nocheck and nodoc to DEB_BUILD_OPTIONS

[Bastian Germann]

Am 31.07.20 um 15:51 schrieb Christian Teklenborg:
> Setting the --profile nocheck and nodoc is not sufficient. The build must also
> set the environment variable DEB_BUILD_OPTIONS to nocheck/nodoc.
> 
> This patch fixes the issue #232.
> 
> Signed-off-by: Christian Teklenborg <chris at linutronix.de>

Reviewed-by: Bastian Germann <bage at linutronix.de>

...and applied on master.

> ---
>  elbepack/elbeproject.py | 12 ++++++++----
>  1 file changed, 8 insertions(+), 4 deletions(-)
> 
> diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
> index cd5020dc..5ab86b54 100644
> --- a/elbepack/elbeproject.py
> +++ b/elbepack/elbeproject.py
> @@ -769,6 +769,9 @@ class ElbeProject (object):
>              # cpuset == -1 means empty cpuset_cmd
>              cpuset_cmd = ''
>  
> +        profile_list = profile.split(",")
> +        deb_build_opts = [i for i in profile_list if i=="nodoc" or i=="nocheck"]
> +
>          try:
>              if cross:
>                  do('cd "%s"; dpkg-source -b .; %s '
> @@ -780,7 +783,8 @@ class ElbeProject (object):
>                         os.path.join(self.builddir, "cross_pbuilderrc"),
>                         os.path.join(self.builddir, "pbuilder_cross", "base.tgz"),
>                         os.path.join(self.builddir, "pbuilder_cross", "result")),
> -                   env_add={'DEB_BUILD_PROFILES': profile.replace(",", " ")})
> +                   env_add={'DEB_BUILD_PROFILES': profile.replace(",", " "),
> +                            'DEB_BUILD_OPTIONS': " ".join(deb_build_opts)})
>                  self.repo.include(os.path.join(self.builddir,
>                                                 "pbuilder_cross",
>                                                 "result",
> @@ -790,11 +794,11 @@ class ElbeProject (object):
>                     '--configfile "%s" '
>                     '--use-pdebuild-internal --buildresult "%s"' % (
>                         os.path.join(self.builddir, "pdebuilder", "current"),
> -                       cpuset_cmd,
> -                       cfg['pbuilder_jobs'],
> +                       cpuset_cmd, cfg['pbuilder_jobs'],
>                         os.path.join(self.builddir, "pbuilderrc"),
>                         os.path.join(self.builddir, "pbuilder", "result")),
> -                   env_add={'DEB_BUILD_PROFILES': profile.replace(",", " ")})
> +                   env_add={'DEB_BUILD_PROFILES': profile.replace(",", " "),
> +                            'DEB_BUILD_OPTIONS': " ".join(deb_build_opts)})
>                  self.repo.include(os.path.join(self.builddir,
>                                                 "pbuilder",
>                                                 "result",
>