[elbe-devel] [PATCH v3 1/2] elbeproject: Fix debootstrap includes syntax

[Torben Hohn]

On Tue, Jul 27, 2021 at 11:34:39AM +0200, bage at linutronix.de wrote:
> From: Bastian Germann <bage at linutronix.de>
> 
> The debootstrapopts in pbuilder call needs --includes separated by comma.
> The wrong syntax does not result in debootstrap erroring, so gnupg will be
> missing if it is not included through another code path.
> 
> Fixes: 05b38ebcd4d6 ("pbuilder: fix pbuilder creation for buster and stretch")
> Signed-off-by: Bastian Germann <bage at linutronix.de>

Reviewed-by: Torben Hohn <torben.hohn at linutronix.de>

> ---
>  elbepack/elbeproject.py | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/elbepack/elbeproject.py b/elbepack/elbeproject.py
> index 8617d80f9..68938b933 100644
> --- a/elbepack/elbeproject.py
> +++ b/elbepack/elbeproject.py
> @@ -874,13 +874,13 @@ class ElbeProject:
>          if cross:
>              do('pbuilder --create --buildplace "%s" '
>                 '--configfile "%s" --aptconfdir "%s" '
> -               '--debootstrapopts --include="git gnupg";' %
> +               '--debootstrapopts --include="git,gnupg";' %
>                 (os.path.join(self.builddir, "pbuilder_cross"),
>                  os.path.join(self.builddir, "cross_pbuilderrc"),
>                  os.path.join(self.builddir, "aptconfdir")))
>          else:
>              do('pbuilder --create --configfile "%s" --aptconfdir "%s" '
> -               '--debootstrapopts --include="git gnupg"' %
> +               '--debootstrapopts --include="git,gnupg"' %
>                 (os.path.join(self.builddir, "pbuilderrc"),
>                  os.path.join(self.builddir, "aptconfdir")))
>  
> -- 
> 2.30.2
> 
> _______________________________________________
> elbe-devel mailing list
> elbe-devel at linutronix.de
> https://lists.linutronix.de/mailman/listinfo/elbe-devel

-- 
Torben Hohn
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen
Phone: +49 7556 25 999 18; Fax.: +49 7556 25 999 99

Hinweise zum Datenschutz finden Sie hier (Informations on data privacy 
can be found here): https://linutronix.de/kontakt/Datenschutz.php

Linutronix GmbH | Firmensitz (Registered Office): Uhldingen-Mühlhofen | 
Registergericht (Registration Court): Amtsgericht Freiburg i.Br., HRB700 
806 | Geschäftsführer (Managing Directors): Heinz Egger, Thomas Gleixner