[elbe-devel] [PATCH v2 26/27] elbexml: fix sources.list to not include arch for deb-src

Torben Hohn torben.hohn at linutronix.de
Thu Sep 24 16:56:23 CEST 2020


[arch=xxx] is misplaced for the deb-src entries.

Reorder the code, so that the architecture is added to poptions
after the deb-src line has been generated.

Signed-off-by: Torben Hohn <torben.hohn at linutronix.de>
---
 elbepack/elbexml.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/elbepack/elbexml.py b/elbepack/elbexml.py
index 1a0735623..4ea4fb58e 100644
--- a/elbepack/elbexml.py
+++ b/elbepack/elbexml.py
@@ -181,19 +181,19 @@ class ElbeXML(object):
             else:
                 arch = self.text("project/buildimage/arch", key="arch")
 
-            poptions.append("arch=%s" % arch)
-
             poptions = goptions + poptions
 
-            mirrors.append("deb [%s] %s %s main" %
-                           (' '.join(poptions),
-                            pmirror, suite))
-
             if build_sources:
                 mirrors.append("deb-src [%s] %s %s main" %
                                (' '.join(poptions),
                                 pmirror, suite))
 
+            poptions.append("arch=%s" % arch)
+
+            mirrors.append("deb [%s] %s %s main" %
+                           (' '.join(poptions),
+                            pmirror, suite))
+
             if self.prj.has("mirror/url-list"):
 
                 for url in self.prj.node("mirror/url-list"):
-- 
2.20.1



More information about the elbe-devel mailing list