[PATCH] Revert "deb-dl-dir: Use dpkg-deb --field in debsrc_download"

[PATCH] Revert "deb-dl-dir: Use dpkg-deb --field in debsrc_download"

[Uladzimir Bely]

This reverts commit b75d6eb9 since Debian bug #1004372 is fixed now.
---
 meta/classes/deb-dl-dir.bbclass | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/meta/classes/deb-dl-dir.bbclass b/meta/classes/deb-dl-dir.bbclass
index ca2a1ee2..f0ab9714 100644
--- a/meta/classes/deb-dl-dir.bbclass
+++ b/meta/classes/deb-dl-dir.bbclass
@@ -55,15 +55,8 @@ debsrc_download() {
     printenv | grep -q BB_VERBOSE_LOGS && set -x
     find "${rootfs}/var/cache/apt/archives/" -maxdepth 1 -type f -iname '*\.deb' | while read package; do
         is_not_part_of_current_build "${package}" && continue
-        # Get source package name if available, fallback to package name
-        local src="$( dpkg-deb --field "${package}" Source | awk '{printf $1}' )"
-        [ -z "$src" ] && src="$( dpkg-deb --field "${package}" Package )"
-        # Get source package version if available, fallback to package version
-        local version="$( dpkg-deb --field "${package}" Source |  awk '{gsub(/[()]/,""); printf $2}')"
-        [ -z "$version" ] && version="$( dpkg-deb --field "${package}" Version )"
-        # 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 src="$( dpkg-deb --show --showformat '${source:Package}' "${package}" )"
+        local version="$( dpkg-deb --show --showformat '${source:Version}' "${package}" )"
         local dscname="$(echo ${src}_${version} | sed -e 's/_[0-9]\+:/_/')"
         local dscfile=$(find "${DEBSRCDIR}"/"${rootfs_distro}" -name "${dscname}.dsc")
         [ -n "$dscfile" ] && continue
-- 
2.20.1

Re: [PATCH] Revert "deb-dl-dir: Use dpkg-deb --field in debsrc_download"

[Uladzimir Bely]

In mail from Friday, 7 April 2023 08:29:57 +03 user Uladzimir Bely wrote:
> This reverts commit b75d6eb9 since Debian bug #1004372 is fixed now.
> ---
>  meta/classes/deb-dl-dir.bbclass | 11 ++---------
>  1 file changed, 2 insertions(+), 9 deletions(-)

Applied to next.