From mboxrd@z Thu Jan 1 00:00:00 1970 X-GM-THRID: 7124895699229999104 X-Received: by 2002:a05:6a00:174e:b0:52b:c705:a42c with SMTP id j14-20020a056a00174e00b0052bc705a42cmr20487076pfc.68.1658894051831; Tue, 26 Jul 2022 20:54:11 -0700 (PDT) X-BeenThere: isar-users@googlegroups.com Received: by 2002:a17:90a:6f05:b0:1f2:fb55:49b0 with SMTP id d5-20020a17090a6f0500b001f2fb5549b0ls617206pjk.2.-pod-canary-gmail; Tue, 26 Jul 2022 20:54:10 -0700 (PDT) X-Google-Smtp-Source: AGRyM1skAKO/XKslohPPz8oPfTpsLjIEKSGrlRW2nd01Q6JMcZTUwErYIaXWonTlWABSCZHsVE+L X-Received: by 2002:a17:902:d48f:b0:16d:4b2e:e2a2 with SMTP id c15-20020a170902d48f00b0016d4b2ee2a2mr19618845plg.77.1658894050794; Tue, 26 Jul 2022 20:54:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1658894050; cv=none; d=google.com; s=arc-20160816; b=gdVO08t+laUVzuxhEEDSuvJNaemMgBH+7F9XSLBX9wxTHWofguci19N526e9j2Q/5U 2xbEGMr3Jfn4eAgVX7xhmLiD5qvu3WZdwoybMLlpHsmVBjDaSL69f05TOS6+1T4PHcmc euJLo+zQG9CneD/CR+zoObCsik7ZHVGmpwL/Rk0ddGc7sLIdiCNOY+vbk/tvRD7XEVYM 0iLhvcewp9ZigeJrSAZg1Z3w6ldtQbnC46mW7cmUUh6uPSFJ/GTwOD3/FtrsuSgCD6Dp WusoRKOq07zI+faMm2CyBTEy4DmoPdO9lH9ouyjlaekVS9V1keoEtMy+o6HW4yvK5Bx1 1sTg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:message-id:date:subject:to :from; bh=M/bE0DRj8CvrHZm97pEDKhFM80dMsFqlvsT7MCbziZk=; b=vANPmHlPqm0c450w2YLcdhFU3GTGWJe+oRBz1vDX9z1sx1FOgNqDMLVRsYc+DiBVfE 2raVk2UoWOvWB5UVNPwmZan1SUCbkppr4X/2vt/iieZGNDCmTVdz4OlnmgBcFmO4wF90 G88lQD6UhqOuBivlrrSRT3Nuo4POZ4sPqHd7qfMYTR/IlieObWPHXAaeH40Cij6bVzb6 STy6NLdJGw/jfPycLomvuDKwKFBy/a3ZgTsMFCcofMAkmw83nIUF/b3+wx/zScQFmgsS p5x/fy+6bI9BDzoMGG12kVZrHEJn9mhDIppT/Dh4U5Uu1Q6JvSK06UaQJrKXxDV3ad1Q OfMw== ARC-Authentication-Results: i=1; gmr-mx.google.com; spf=pass (google.com: domain of ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Return-Path: Received: from shymkent.ilbers.de (shymkent.ilbers.de. [85.214.156.166]) by gmr-mx.google.com with ESMTPS id n13-20020a17090aab8d00b001ef94afbc2esi91209pjq.2.2022.07.26.20.54.10 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 26 Jul 2022 20:54:10 -0700 (PDT) Received-SPF: pass (google.com: domain of ubely@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 ubely@ilbers.de designates 85.214.156.166 as permitted sender) smtp.mailfrom=ubely@ilbers.de Received: from baighyz.m.ilbers.de (host-80-81-17-52.static.customer.m-online.net [80.81.17.52]) (authenticated bits=0) by shymkent.ilbers.de (8.15.2/8.15.2/Debian-8+deb9u1) with ESMTPSA id 26R3s7fR025511 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT) for ; Wed, 27 Jul 2022 05:54:08 +0200 From: Uladzimir Bely To: isar-users@googlegroups.com Subject: [PATCH] deb-dl-dir: Avoid redownload src packages with epoch in version Date: Wed, 27 Jul 2022 05:54:07 +0200 Message-Id: <20220727035407.29929-1-ubely@ilbers.de> X-Mailer: git-send-email 2.20.1 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: oYCEtRACm254 Some source packages include epoch number in their version string. This makes check for already downloaded .dsc file wrong. Example: `libxcrypt_4.4.18-4.dsc` package has version `1:4.4.18-4`. The patch fixes check for existing .dsc file and reduces a bit build time and network usage. Signed-off-by: Uladzimir Bely --- meta/classes/deb-dl-dir.bbclass | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass index 188cb832..3b1517dc 100644 --- a/meta/classes/deb-dl-dir.bbclass +++ b/meta/classes/deb-dl-dir.bbclass @@ -64,7 +64,8 @@ debsrc_download() { # TODO: get back to the code below when debian bug #1004372 is fixed # local src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )" # local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )" - local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${src}_${version}.dsc") + local dscname="$(echo ${src}_${version} | sed -e 's/_[0-9]\+:/_/')" + local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${dscname}.dsc") [ -n "$dscfile" ] && continue sudo -E chroot --userspec=$( id -u ):$( id -g ) ${rootfs} \ -- 2.20.1