From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7336105500565569536 X-Received: by 2002:a05:6512:b91:b0:512:94b4:40c2 with SMTP id b17-20020a0565120b9100b0051294b440c2mr1712639lfv.0.1708092669926; Fri, 16 Feb 2024 06:11:09 -0800 (PST) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a05:6512:3d01:b0:511:528a:c0d6 with SMTP id d1-20020a0565123d0100b00511528ac0d6ls31059lfv.0.-pod-prod-09-eu; Fri, 16 Feb 2024 06:11:08 -0800 (PST) X-Google-Smtp-Source: AGHT+IG9SI3CjTJpMR81AEWQ+2+RnOGLrzxCd8Jq4mmXJPzWntA608a2Ev2ecUaDAlwyHGdd+DIy X-Received: by 2002:a2e:98d5:0:b0:2d1:120d:3602 with SMTP id s21-20020a2e98d5000000b002d1120d3602mr3733038ljj.41.1708092667931; Fri, 16 Feb 2024 06:11:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1708092667; cv=none; d=google.com; s=arc-20160816; b=H3RiEq1PIsOeFgYOcCaYIreAQ8G5TPSiVfy5TzLDNoz9SOG2+huouM4AnJmM/PPDy1 q0lLz3Z6RTN0qs8FX94yBscb7uIR4iza877WIbkzqs6wRGQA82FFy/8LjW6OFsvZ0mMY UynYnewKXl9eGFghDtBA5vwPKNXWAv2x7ydrOqyusbFhA7JkSTKTOT6RqIQeW7hjauqM xfbMxjlrDAupLUuv2wuJteCPP5iZX2Mo2mW4ShaHJheZ0/VkDgfkDVRh0t6gEeuWFM+a EX+FXaeVB3PrvJn+mgpLKukYLtWdnLT+XCmhlyitNzHzWfUNMwXCjO8nXMBM1S7uvCIK 1PCA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=9KVFh64D6nXIPzKAXx1QexuFdN8dIBmpGoYhRhayVak=; fh=/h9QQkzJ8EboVkWg45aWwpaUro6WMavIVd2OhN45RtE=; b=m8RWsx2YSaGxLkP/VcYQUv35YkqFY08pSpr+mPwrVxlVc85SCPr/4GTuNjpaGWZ/Nf rw3lgXceiRkUNxmW9i+J7aP+7Apkhe6PfJN8zpM0xl9jzF1VB8Aq/npLr2P2OoAWdQG5 rViah9XyE2JrcY+LryAbN69+ghNFuIHFy5gCB6pavYA1MzwN3exJMg45ARwyQpNIr0Mh 5UFr9Ky6wzSZF2XyYlW6ctW03Ykb3znHw/MLSnNoNDhzetXdcfvIl/u/28p9RtGz3dSt BT/fSlgCCDikY9+wZcxlU9Z3ssfbNoz3khC6iWt0F1CJrO2tqJIjwrmN0Zo3TmpVSmK0 iCDw==; dara=google.com ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id b17-20020a2e8951000000b002d0f87fb1c4si169936ljk.1.2024.02.16.06.11.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Fri, 16 Feb 2024 06:11:07 -0800 (PST) Received-SPF: pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) client-ip=85.214.156.166; Authentication-Results: gmr-mx.google.com; spf=pass (google.com: domain of amikan@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=amikan@ilbers.de Received: from user-B660.promwad.corp ([159.148.83.123]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 41GEAvi2001330 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Fri, 16 Feb 2024 15:11:01 +0100 From: Anton Mikanovich To: isar-users@googlegroups.com Cc: Anton Mikanovich Subject: [PATCH v2 3/4] dpkg-base: Fix SRC_URI:remove ignoring Date: Fri, 16 Feb 2024 16:10:50 +0200 Message-Id: <20240216141051.3490109-4-amikan@ilbers.de> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20240216141051.3490109-1-amikan@ilbers.de> References: <20240216141051.3490109-1-amikan@ilbers.de> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-1.0 required=5.0 tests=ALL_TRUSTED 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-TUID: YbfVVtN3W2mj Current SRC_APT filling code results in losing SRC_URI:remove values. Remove setting SRC_URI value in prior to remove apt:// items with additional variables. Signed-off-by: Anton Mikanovich --- meta/classes/dpkg-base.bbclass | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/meta/classes/dpkg-base.bbclass b/meta/classes/dpkg-base.bbclass index a8263046..5f88c805 100644 --- a/meta/classes/dpkg-base.bbclass +++ b/meta/classes/dpkg-base.bbclass @@ -87,15 +87,12 @@ python() { src_uri = (d.getVar('SRC_URI', False) or "").split() prefix = "apt://" - new_src_uri = [] src_apt = [] for u in src_uri: if u.startswith(prefix): src_apt.append(u[len(prefix) :]) - else: - new_src_uri.append(u) + d.setVar('SRC_URI:remove', u) - d.setVar('SRC_URI', ' '.join(new_src_uri)) d.prependVar('SRC_APT', ' '.join(src_apt)) if len(d.getVar('SRC_APT').strip()) > 0: -- 2.34.1