[svn-commits] mvanbaak: branch 1.6.1 r208544 - in /branches/1.6.1: ./ contrib/scripts/

[SVN commits to the Digium repositories]

Author: mvanbaak
Date: Fri Jul 24 09:38:36 2009
New Revision: 208544

URL: http://svn.asterisk.org/svn-view/asterisk?view=rev&rev=208544
Log:
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)
........

Modified:
    branches/1.6.1/   (props changed)
    branches/1.6.1/contrib/scripts/install_prereq

Propchange: branches/1.6.1/
------------------------------------------------------------------------------
Binary property 'trunk-merged' - no diff available.

Modified: branches/1.6.1/contrib/scripts/install_prereq
URL: http://svn.asterisk.org/svn-view/asterisk/branches/1.6.1/contrib/scripts/install_prereq?view=diff&rev=208544&r1=208543&r2=208544
==============================================================================
--- branches/1.6.1/contrib/scripts/install_prereq (original)
+++ branches/1.6.1/contrib/scripts/install_prereq Fri Jul 24 09:38:36 2009
@@ -45,10 +45,9 @@
   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 @@
 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() {