From: George Joseph <george.joseph@fairview5.com>
Date: Sun, 3 Apr 2016 16:47:30 +0000 (-0600)
Subject: install_prereq:  Fix check_installed_debs remove subversion
X-Git-Tag: 13.9.0-rc1~49^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9d4318f79852b4318a5204495335fd971b20cab0;p=thirdparty%2Fasterisk.git

install_prereq:  Fix check_installed_debs remove subversion

check_installed_debs wasn't handling virtual packages like libsrtp-dev and
libresample-dev and on multiarch systems it was accidentally filtering out all
packages if any :i386 packages were found instead of just filtering out the
:i386 packages themselves.

Change-Id: Ifd68da0d1ee30cc84df14de3f9b9079d7c3cecda
---

diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq
index afad1f7196..1682558ac3 100755
--- a/contrib/scripts/install_prereq
+++ b/contrib/scripts/install_prereq
@@ -66,13 +66,12 @@ in_test_mode() {
 }
 
 check_installed_debs() {
-	for pack in "$@"
-	do
-		tocheck="${tocheck} ^${pack}$"
+	for pack in "$@" ; do
+		tocheck="${tocheck} ^${pack}$ ~P^${pack}$"
 	done
 	pkgs=$(aptitude -F '%c %p' search ${tocheck} 2>/dev/null | awk '/^p/{print $2}')
-	if ! [ ${#pkgs} -eq 0 ]; then
-		echo $pkgs | grep -v ':i386$'
+	if [ ${#pkgs} -ne 0 ]; then
+		echo $pkgs | sed -r -e "s/ ?[^ :]+:i386//g"
 	fi
 }