From 723c8d6315427af3eab85882390cb75737b0fd4b Mon Sep 17 00:00:00 2001
From: Andrei Aaron <aaaron@luxoft.com>
Date: Wed, 21 Jun 2023 15:58:55 +0000
Subject: [PATCH] fix(multiarch): fix deb cross-arch downloads

---
 pkgmgr/defs.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/pkgmgr/defs.sh b/pkgmgr/defs.sh
index 236f0ab..ae38807 100755
--- a/pkgmgr/defs.sh
+++ b/pkgmgr/defs.sh
@@ -39,12 +39,12 @@ unpack_deb() {
 
   dpkg --add-architecture "$ARCH"
 
+  old_path=$(pwd)
+  cd "$dldir"
   DEBIAN_FRONTEND=noninteractive \
-    apt-get -y --reinstall install \
-    "--option=Dir::Cache::Archives=$dldir" \
-    --no-install-recommends \
-    --download-only \
+    apt-get -y download \
     "$pkg":"$ARCH"
+  cd "$old_path"
 
   echo DLDIR="$dldir"
   ls "$dldir"
@@ -62,11 +62,11 @@ unpack_debs() {
 
   dpkg --add-architecture "$ARCH"
 
+  old_path=$(pwd)
+  cd "$dldir"
   DEBIAN_FRONTEND=noninteractive \
-    xargs apt-get -y --reinstall install \
-    "--option=Dir::Cache::Archives=$dldir" \
-    --no-install-recommends \
-    --download-only <$pkgs_file
+    xargs apt-get -y download <$pkgs_file
+  cd "$old_path"
 
   echo DLDIR="$dldir"
   ls "$dldir"/