[elbe-devel] [PATCH 1/1] pbuilder: Fix syntax errors

[Torben Hohn]

On Wed, Sep 23, 2020 at 05:29:38PM +0200, bage at linutronix.de wrote:
> From: Bastian Germann <bage at linutronix.de>
> 
> 4b2529e016 (pbuilder: Update the mirror management of pbuilder hook)
> introduced 3 syntax errors. Fix them.
> 
> Signed-off-by: Bastian Germann <bage at linutronix.de>
> ---
>  elbepack/pbuilder.py | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/elbepack/pbuilder.py b/elbepack/pbuilder.py
> index 710ea7d08..7799ebe9e 100644
> --- a/elbepack/pbuilder.py
> +++ b/elbepack/pbuilder.py
> @@ -149,8 +149,8 @@ def pbuilder_write_repo_hook(builddir, xml, cross):
>  
>      with open(os.path.join(pbuilder_hook_dir, "G10elbe_apt_sources"), "w") as f:
>  
> -        local_http = "deb http://127.0.0.1:8080%s/repo %s main\n" %
> -			(builddir, xml.prj.text("suite"))
> +        local_http = "deb http://127.0.0.1:8080%s/repo %s main\n" % (
> +                     builddir, xml.prj.text("suite"))
>          mirrors = xml.create_apt_sources_list(hostsysroot=cross)
>          mirrors = local_http + mirrors
>  
> @@ -177,7 +177,7 @@ def get_apt_keys(builddir, xml):
>  
>      keys    = [Filesystem(builddir).read_file("repo/repo.pub")]
>  
> -    if xml.prj.has("mirror/primary_host") and xml.prj.has("mirror/url-list")
> +    if xml.prj.has("mirror/primary_host") and xml.prj.has("mirror/url-list"):
>  
>          for url in xml.prj.node("mirror/url-list"):
>  
> @@ -189,7 +189,7 @@ def get_apt_keys(builddir, xml):
>                   options = ""
>  
>  
> -            if url.has("raw-key") and not "trusted=yes" in options:
> +             if url.has("raw-key") and not "trusted=yes" in options:
>  
>                  key = "\n".join(line.strip(" \t")
>                                  for line

you dont adjust the indention on the block beginning here.
i already have a patch.
It resides in devel/torbenh/py2removal though.

i will put it on top of that queue, and post it.



> -- 
> 2.28.0
> 
> _______________________________________________
> 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