From: Michiel van Baak <michiel@vanbaak.info>
Date: Fri, 24 Jul 2009 14:38:36 +0000 (+0000)
Subject: Merged revisions 208542 via svnmerge from
X-Git-Tag: 1.6.1.3-rc1~21
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6ff2304e03e23fad4937b681ad064e62e7a9970f;p=thirdparty%2Fasterisk.git

Merged revisions 208542 via svnmerge from
https://origsvn.digium.com/svn/asterisk/trunk

........
  r208542 | mvanbaak | 2009-07-24 16:35:49 +0200 (Fri, 24 Jul 2009) | 13 lines

  use aptitude for debian based systems

  The function to check wether we need to install packages was using
  dpkg-query which was gives wrong output on Debian 5

  Also, the apt-get has been replaced with aptitude because aptitude
  is now the preferred way to handle packages on Debian

  (closes issue #15570)
  Reported by: mvanbaak
  Patches:
        2009072400_installprereq-aptitude.diff uploaded by mvanbaak (license 7)
........


git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.6.1@208544 65c4cc65-6c06-0410-ace0-fbb531ad65f3
---

diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq
index 8770b9f598..ddb3f1aee7 100755
--- a/contrib/scripts/install_prereq
+++ b/contrib/scripts/install_prereq
@@ -45,10 +45,9 @@ in_test_mode() {
   test "$testcmd" != ''
 }
 
-# Fixme: should be done by apt and not by dpkg?
 check_installed_debs() {
-	 dpkg-query -W --showformat '${Status} ${Package}\n' "$@" 2>/dev/null \
-	 | awk '/ not-installed/{print $4}'
+	aptitude -F '%c %p' search "$@" 2>/dev/null \
+	| awk '/^p/{print $2}'
 }
 
 # parsing the output of yum is close to impossible.
@@ -65,7 +64,7 @@ check_installed_rpms() {
 handle_debian() {
 	# echo "# Distribution is Debian or compatible"
 	extra_packs=`check_installed_debs $PACKAGES_DEBIAN`
-	$testcmd apt-get install -y $extra_packs
+	$testcmd aptitude install -y $extra_packs
 }
 
 handle_rh() {