[elbe-devel] [PATCH v2 3/4] Add support to specify the architecture on the extra urls mirrors.

Olivier Dion dion at linutronix.de
Fri Jun 12 22:28:23 CEST 2020


On Fri, 12 Jun 2020, Kory Maincent <kory.maincent at bootlin.com> wrote:
> diff --git a/elbepack/elbexml.py b/elbepack/elbexml.py
> index f0e3307..96df16b 100644
> --- a/elbepack/elbexml.py
> +++ b/elbepack/elbexml.py
> @@ -178,8 +178,11 @@ class ElbeXML(object):
>                  mirror += "deb-src " + option + self.get_primary_mirror(None, hostsdk=hostsdk)
>                  mirror += " " + self.prj.text("suite") + " main\n"
>  
> -            if self.prj.has("mirror/url-list") and not hostsdk:
> +            if self.prj.has("mirror/url-list"):
>                  for url in self.prj.node("mirror/url-list"):
> +                    if 'arch' in url.et.attrib:
> +                        option = "[" + noauth + " arch=" + url.et.attrib['arch'] +"] "
Prefer string formating:
----------------------------------------------------------------------
url_arch = "arch=%s" % url.et.attrib["arch"]
option   = "[%s %s]" % (noauth, url_arch)
----------------------------------------------------------------------

>                      if url.has("binary"):
>                          mirror += "deb " + option + \
>                              url.text("binary").strip() + "\n"
> diff --git a/schema/dbsfed.xsd b/schema/dbsfed.xsd
> index e3709de..ec0bb13 100644
> --- a/schema/dbsfed.xsd
> +++ b/schema/dbsfed.xsd
> @@ -224,7 +231,6 @@
>          </annotation>
>        </element>
>      </sequence>
> -    <attribute ref="xml:base"/>
Why does this line needs to be removed?

-- 
Olivier Dion
Linutronix GmbH | Bahnhofstrasse 3 | D-88690 Uhldingen-Mühlhofen



More information about the elbe-devel mailing list