From: Jo-Philipp Wich <jo@mein.io>
Date: Mon, 21 Jan 2019 15:35:40 +0000 (+0100)
Subject: scripts: ipkg-remove: handle existing .ipk files without SourceName field
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=8c9b182db63fb8be6906cdf8df84e58c9c9daae7;p=openwrt%2Fstaging%2Faparcar.git

scripts: ipkg-remove: handle existing .ipk files without SourceName field

Package archives built before commit e6bcf1e4ac
("build: add ABI_VERSION to binary package names") lack the SourceName
control file field which caused ipkg-remove to skip such archives.

Add fallback code that matches the files by their basename followed by
an underscore, similar to how the old cleanup code worked.

Fixes: #2067
Signed-off-by: Jo-Philipp Wich <jo@mein.io>
---

diff --git a/scripts/ipkg-remove b/scripts/ipkg-remove
index c0e0ec880f..f4957004c0 100755
--- a/scripts/ipkg-remove
+++ b/scripts/ipkg-remove
@@ -10,6 +10,11 @@ for pkg in "$@"; do
 			break
 		fi
 	done
+	case "$pkg" in
+		*/"${sourcename}_"*.ipk)
+			rm -vf "$pkg"
+		;;
+	esac
 done
 
 exit 0