[PATCH 0/1] deb-dl-dir: do not assume Version being before Source in RC822 headers

[PATCH 0/1] deb-dl-dir: do not assume Version being before Source in RC822 headers

['Cedric Hombourger' via isar-users]

This is the same bugfix as the RFC PATCH: no regressions observed in
our testing. The commit message was slightly amended to note to
replace "apt dumpavail" with "apt-cache dumpavail".

Cedric Hombourger (1):
  deb-dl-dir: do not assume Version being before Source in RC822 headers

 meta/classes/deb-dl-dir.bbclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

-- 
2.39.5

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20250413021119.2577412-1-cedric.hombourger%40siemens.com.

[PATCH 1/1] deb-dl-dir: do not assume Version being before Source in RC822 headers

['Cedric Hombourger' via isar-users]

Caching of Debian source packages uses "apt-cache dumpavail" to list
sources known to the apt cache and "apt-ftparchive" to list sources
that were downloaded. With the former, the Source field may appear
before the Version field. The awk script used to list source,version
tuples assuming the following order: Package Version [Source] Size.
It now handles the case where Source may appear before Version (as
seen in the "apt-cache dumpavail" output.

Fixes: 40f67049
Reported-by: Srinuvasan A <srinuvasan.a@siemens.com>
Signed-off-by: Cedric Hombourger <cedric.hombourger@siemens.com>
---
 meta/classes/deb-dl-dir.bbclass | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
index 75877750..af031ced 100644
--- a/meta/classes/deb-dl-dir.bbclass
+++ b/meta/classes/deb-dl-dir.bbclass
@@ -35,8 +35,12 @@ debsrc_source_version_filter() {
     # if <source-version> is not specified then it is <binary-version>.
     # The awk script handles these optional fields. It looks for Size: as a
     # trigger to print the source,version tupple
-    awk '/^Package:/ { s=$2; }
-         /^Version:/ { v=$2; next }
+    #
+    # Notes: Source may appear before Version. We however assume that
+    # Package is the first pattern we will match in a package block
+    # and Size the last.
+    awk '/^Package:/ { s=$2; v="" }
+         /^Version:/ { if (v == "") v=$2 }
          /^Source:/ { s=$2; if ($3 ~ /^\(/) v=substr($3, 2, length($3)-2) }
          /^Size:/ { print s, v}' \
     | sort -u
-- 
2.39.5

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/20250413021119.2577412-2-cedric.hombourger%40siemens.com.

Re: [PATCH 0/1] deb-dl-dir: do not assume Version being before Source in RC822 headers

[Baurzhan Ismagulov]

On 2025-04-13 04:11, 'Cedric Hombourger' via isar-users wrote:
> This is the same bugfix as the RFC PATCH: no regressions observed in
> our testing. The commit message was slightly amended to note to
> replace "apt dumpavail" with "apt-cache dumpavail".
> 
> Cedric Hombourger (1):
>   deb-dl-dir: do not assume Version being before Source in RC822 headers
> 
>  meta/classes/deb-dl-dir.bbclass | 8 ++++++--
>  1 file changed, 6 insertions(+), 2 deletions(-)

Applied to next, thanks.

With kind regards,
Baurzhan

-- 
You received this message because you are subscribed to the Google Groups "isar-users" group.
To unsubscribe from this group and stop receiving emails from it, send an email to isar-users+unsubscribe@googlegroups.com.
To view this discussion visit https://groups.google.com/d/msgid/isar-users/aBtvybUSWPlpQqvn%40abai.de.