From patchwork Fri Apr 11 06:52:53 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Cedric Hombourger X-Patchwork-Id: 4160 Return-Path: Received: from shymkent.ilbers.de ([unix socket]) by shymkent (Cyrus 2.5.10-Debian-2.5.10-3+deb9u2) with LMTPA; Fri, 11 Apr 2025 08:53:15 +0200 X-Sieve: CMU Sieve 2.4 Received: from mail-lf1-f63.google.com (mail-lf1-f63.google.com [209.85.167.63]) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPS id 53B6rE4o015652 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Fri, 11 Apr 2025 08:53:14 +0200 Received: by mail-lf1-f63.google.com with SMTP id 2adb3069b0e04-54c0a1ca4f7sf860572e87.3 for ; Thu, 10 Apr 2025 23:53:14 -0700 (PDT) ARC-Seal: i=2; a=rsa-sha256; t=1744354388; cv=pass; d=google.com; s=arc-20240605; b=dehESVijqPexyy8JMEXummXPL5G3/xoRSx4XrCKnahnGmAmlHcdrdlSj3bid14XOSN Qn+rTZ5DS024TMdjjI46mjhwoXxUO25cl+L81Bg5tq2CPwQjjqhOoMAIFMAnSMgLIuD7 eaWzUc13fhLJFa/3TKZAWuqcw0br6jtgVeRGo0iyp2ALDPpgiwsiDRgyQSOESHkB1eB0 u+CnHKdgGRRkDCzA/Cb219aChIN/La+Yb56JV6toksq6sN90Xp2nGFZYEOoXg+uVbXb9 XByVg5u3R4kAIxS/rY0oRyRhKYchYKUR+U8WQGN92wvkgdu4u75hZ2NN3CUuy+yv1Dj4 Dcbw== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to:feedback-id:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=iI8EWanrPYhRiZ5lL9yVLNqyUOJOvRVj1VAoSiDuBuA=; fh=8j9bmQZhUWOxZE4lFslm1dpJQhg1N6bZS5wUxnwCda4=; b=IQm27UE7P/AVcMNsGI+jppZRttwM7jUkcQY+zmfvOaqS74LiEtPXuQSmgXA0UMZPc5 wJZUmnekFWCELXLURoHzk0R5smnJ0mZyc+NGFcpU3Lgv9t0ecK60tOvU4zY1Fp4pH+xt JehHBK9jreVW3kUNnXVvz0k5ANPDgDAJVMNXVRolL3xXdU1JXEebjCZBZU0wpKN/Qak2 5Tf0v4rmlPvYuio9pAJQVdQnbPZiX5ouAAx6DVugb9CjKT4+oOsh91WD6C9RkY73CmEH z9HX/bRu+sVTdZS/8Gq/8rX8+EMUxt0Id8OM2pQOzqRw/Cll968I8iVq/A6kqXoUG6xT n0AQ==; darn=isar-build.org ARC-Authentication-Results: i=2; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=bfw26sXC; spf=pass (google.com: domain of fm-1212295-20250411065304f7f3b0108fad02ef0e-6c2_fu@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1212295-20250411065304f7f3b0108fad02ef0e-6C2_FU@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=googlegroups.com; s=20230601; t=1744354388; x=1744959188; darn=isar-build.org; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:from:to:cc:subject:date:message-id:reply-to; bh=iI8EWanrPYhRiZ5lL9yVLNqyUOJOvRVj1VAoSiDuBuA=; b=xxCWgoYiCUqIaBxRCpJB4GyPvBXlFHqNR7KEZPDY+fxNVbwUf7oFopGYuideaHh2Is K8MmiHLebciYBvcLv2bcR2EJ7Z81iZ2dlGwe7ERMyqlBheMZJC8+IqF5xeIFz89RWhew EyhhnGF2INowYCMLGmpPIIpIs2fGING4/+UOHw3eQIBeGu4png4ZCigZFwVgLYAijydu vnLCCi5hJX59cBlPXEDC66+3QQ5pzud3BE6J02fr2V7orm4eamzBDvEL6ssA8UNue6A2 RbCD4EDuHigSxKyek6bIOCv0b068hTz6At8NcNPNpsCbt6b1kkgbbFUeAR668QHRJaXw ppMA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1744354388; x=1744959188; h=list-unsubscribe:list-subscribe:list-archive:list-help:list-post :x-spam-checked-in-group:list-id:mailing-list:precedence:reply-to :x-original-authentication-results:x-original-sender:feedback-id :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:x-beenthere:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=iI8EWanrPYhRiZ5lL9yVLNqyUOJOvRVj1VAoSiDuBuA=; b=nB8LRBWynB9vY99yuJ3KzoODBMsNLEwbwruk8n0p+AJoA9ZqMaBOLFwJG53SKQQ0Ok sp7R6BTmybu9CeR0/0KlfxfGuYDmZErI5DNgqwlXcV/5n0WO2rghJxOBw87aobu7t8e7 4DKsIysIiNWK/fptumWVvOoziK1sCECD7543W2Vwi4WegoyUtomEube/eRAF/t6BH8wg nfqmhUm/UIMz9GqC8QZFUTGeEA1vNypUzDSmUftqMXInP8aXMZbCrz9g/mVW2yT1RmXS BMQwhzvmOONpia8rpk/YmOtBttP6gvDQkhM+SIJODfUUfIqU0risvBxlsAZX9fgX58I6 XxBA== X-Forwarded-Encrypted: i=2; AJvYcCUWsv+ROmOs50yGAIDi05867AStgQ7oQ7Dgh880F2nHQCon6dL3zh2LKltktef0Xrjfp+6oLHc=@isar-build.org X-Gm-Message-State: AOJu0YydNTM0Jz1EOquwx4+VhiM0tw3f+s2HkawUzDM5dh99tnBjf6HS XpINm0+YcVUGkRVgB+pP/dPBXNeiwhTBewnqMdObNqntmfBVL7aP X-Google-Smtp-Source: AGHT+IHibeLomEfPEzGLiho58XNJUCfi9kAdlFz+/MU4EiS0Pz1PWm/OrRN+HdxV2NJJNMbliNOZ7w== X-Received: by 2002:a05:6512:1050:b0:549:4d7d:b61b with SMTP id 2adb3069b0e04-54d452d382emr363306e87.35.1744354388148; Thu, 10 Apr 2025 23:53:08 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com; h=ARLLPAJGrAzydlKYDwlV1WxRGLmEzQzZT1c7qClqXKvN624HLw== Received: by 2002:a05:6512:3f04:b0:549:9b17:deaf with SMTP id 2adb3069b0e04-54c4e2b4cefls399553e87.0.-pod-prod-02-eu; Thu, 10 Apr 2025 23:53:05 -0700 (PDT) X-Received: by 2002:a05:6512:2213:b0:54b:1055:f4c0 with SMTP id 2adb3069b0e04-54d4528cf5bmr424622e87.4.1744354385193; Thu, 10 Apr 2025 23:53:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1744354385; cv=none; d=google.com; s=arc-20240605; b=XVpwADk1hYimskVEAvlyd5qyIC4dIyiffF/RTxGGlA7wxMbMVe/7Sy+GDXyHLNM1nQ 0hRvpvz+WdJlp7lbc/jPrkjyaZIbCs+WPws6x59ear7Xd1gQmbEetCqDkurOzEdPp0gD 8p7uxgIsMN7PHlCSUgu+TmIRoKrrdEugouVaQwBWzsD0925ov2J/v+7a9EoTLAIRl9cz uXGx1whUGMqhS8KqMH0jnW9Zu2zBE1PGDzely6AiNReor2n2JPkaG/HyPqPiplZ0Jafd gIr7ZzWve8CjyTZ7WrclUxAAMOtMQUFs+J5tVQZQ2rnMFmJoneo94d4Gs6uIZlvL4d0X B/Bg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20240605; h=feedback-id:content-transfer-encoding:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from:dkim-signature; bh=tIQ2+E7UZKEZTNUcSC+pSMxfnsAr2Dpw67aUrIowyPk=; fh=1Cci+V/DsEDUT8lcYzgQp7DqH27IOmzIiRL1EOaK+a4=; b=bn5uI8NJsekqMpPMDwby2mVAvHq/4vg9gSac6uYaxWAHujKNoa73dh+kPEHisoHwRD 1bNyPRkGx0RImAGWFhruC2/C3+1ApJE2T+u05E6cesbcsibQEWWmMGkFyI6CVhcQr2Nc TZZ749ufmCJgE705XTb3f6Eto75C2aNKvraQtnPXClcC+mSv+q7djyf89qj//LiHw5Zr XYpkActbxa1UFhveoyn1vnUq6UOIJUhdVkBRt1VjOgsNcLPNQOpbaajbnyUBBhctRZOf igJa/XqYL9xxFOVI5ioXKg57eze0PVLFTySNO+Uad8YTMOAYCt7m0bl/EHKC4ltGXSSW Bk7Q==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=bfw26sXC; spf=pass (google.com: domain of fm-1212295-20250411065304f7f3b0108fad02ef0e-6c2_fu@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1212295-20250411065304f7f3b0108fad02ef0e-6C2_FU@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com Received: from mta-64-227.siemens.flowmailer.net (mta-64-227.siemens.flowmailer.net. [185.136.64.227]) by gmr-mx.google.com with ESMTPS id 2adb3069b0e04-54d3d1268a4si86212e87.1.2025.04.10.23.53.05 for (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Thu, 10 Apr 2025 23:53:05 -0700 (PDT) Received-SPF: pass (google.com: domain of fm-1212295-20250411065304f7f3b0108fad02ef0e-6c2_fu@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) client-ip=185.136.64.227; Received: by mta-64-227.siemens.flowmailer.net with ESMTPSA id 20250411065304f7f3b0108fad02ef0e for ; Fri, 11 Apr 2025 08:53:04 +0200 X-Patchwork-Original-From: "'Cedric Hombourger' via isar-users" From: Cedric Hombourger To: isar-users@googlegroups.com Cc: ubely@ilbers.de, Cedric Hombourger , Srinuvasan A Subject: [RFC PATCH 1/1] deb-dl-dir: do not assume Version being before Source in RC822 headers Date: Fri, 11 Apr 2025 08:52:53 +0200 Message-Id: <20250411065253.1037538-2-cedric.hombourger@siemens.com> In-Reply-To: <20250411065253.1037538-1-cedric.hombourger@siemens.com> References: <20250411065253.1037538-1-cedric.hombourger@siemens.com> MIME-Version: 1.0 X-Flowmailer-Platform: Siemens Feedback-ID: 519:519-1212295:519-21489:flowmailer X-Original-Sender: cedric.hombourger@siemens.com X-Original-Authentication-Results: gmr-mx.google.com; dkim=pass header.i=@siemens.com header.s=fm2 header.b=bfw26sXC; spf=pass (google.com: domain of fm-1212295-20250411065304f7f3b0108fad02ef0e-6c2_fu@rts-flowmailer.siemens.com designates 185.136.64.227 as permitted sender) smtp.mailfrom=fm-1212295-20250411065304f7f3b0108fad02ef0e-6C2_FU@rts-flowmailer.siemens.com; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=siemens.com X-Original-From: Cedric Hombourger Reply-To: Cedric Hombourger Precedence: list Mailing-list: list isar-users@googlegroups.com; contact isar-users+owners@googlegroups.com List-ID: X-Spam-Checked-In-Group: isar-users@googlegroups.com X-Google-Group-Id: 914930254986 List-Post: , List-Help: , List-Archive: , List-Unsubscribe: , X-Spam-Status: No, score=-4.9 required=5.0 tests=DKIMWL_WL_MED,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,MAILING_LIST_MULTI, RCVD_IN_DNSWL_BLOCKED,RCVD_IN_MSPIKE_H2,RCVD_IN_RP_CERTIFIED, RCVD_IN_RP_RNBL,RCVD_IN_RP_SAFE,SPF_PASS autolearn=unavailable autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on shymkent.ilbers.de X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= Caching of Debian source packages uses "apt 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 dumpavail" output. Fixes: 40f67049 Reported-by: Srinuvasan A Signed-off-by: Cedric Hombourger --- 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 is not specified then it is . # 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