[svn-commits] mjordan: branch 13 r430799 - in /branches/13: ./ contrib/scripts/install_prereq

[SVN commits to the Digium repositories]

Author: mjordan
Date: Mon Jan 19 20:39:46 2015
New Revision: 430799

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=430799
Log:
contrib/scripts/install_prereq: Don't install 32-bit packages on 64-bit hosts

On Debian based systems, the install_prereq tool uses a search command on
Debian that results in selecting both 64-bit and 32-bit packages. Besides the
waste of disk space, this can actually cause aptitude use 100% of memory on a
VM with 1GB of RAM as it tried to work out all of the 32-bit package
dependencies.

This patch filters out the 32-bit packages on a 64-bit machine, and leaves
32-bit machines alone.

ASTERISK-24048 #close
Reported by: Ben Klang
Tested by: Ben Klang, Matt Jordan
patches:
  install_prereq_64-bit_compat.patch uploaded by Ben Klang (License 5876)
........

Merged revisions 430798 from http://svn.asterisk.org/svn/asterisk/branches/11

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

Propchange: branches/13/
------------------------------------------------------------------------------
--- branch-11-merged (original)
+++ branch-11-merged Mon Jan 19 20:39:46 2015
@@ -1,1 +1,1 @@
-/branches/11:1-429517,429539,429632,429783,429804,429825,429867,429893,429982,430009,430126,430415,430487,430506,430564,430589,430795
+/branches/11:1-429517,429539,429632,429783,429804,429825,429867,429893,429982,430009,430126,430415,430487,430506,430564,430589,430795,430798

Modified: branches/13/contrib/scripts/install_prereq
URL: http://svnview.digium.com/svn/asterisk/branches/13/contrib/scripts/install_prereq?view=diff&rev=430799&r1=430798&r2=430799
==============================================================================
--- branches/13/contrib/scripts/install_prereq (original)
+++ branches/13/contrib/scripts/install_prereq Mon Jan 19 20:39:46 2015
@@ -71,7 +71,8 @@
 		tocheck="${tocheck} ^${pack}$"
 	done
 	aptitude -F '%c %p' search ${tocheck} 2>/dev/null \
- 	| awk '/^p/{print $2}'
+		| awk '/^p/{print $2}' \
+		| grep -v ':i386$'
 }
 
 # parsing the output of yum is close to impossible.