From 85c5a5c880272a1b753a9c44f8fc68ca54064637 Mon Sep 17 00:00:00 2001 From: mvanbaak Date: Fri, 24 Jul 2009 14:38:36 +0000 Subject: 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: http://svn.digium.com/svn/asterisk/branches/1.6.1@208544 f38db490-d61c-443f-a65b-d21fe96a405b --- contrib/scripts/install_prereq | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq index 8770b9f59..ddb3f1aee 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() { -- cgit v1.2.3