diff options
| author | George Joseph <george.joseph@fairview5.com> | 2016-04-03 10:47:30 -0600 |
|---|---|---|
| committer | Richard Mudgett <rmudgett@digium.com> | 2016-04-04 13:45:07 -0500 |
| commit | 9d4318f79852b4318a5204495335fd971b20cab0 (patch) | |
| tree | 422c157e09806766884705367a1bdb97fa30c7fb /contrib | |
| parent | 566601837e312915494cf6d75c8b303505a43fa2 (diff) | |
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
Diffstat (limited to 'contrib')
| -rwxr-xr-x | contrib/scripts/install_prereq | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/contrib/scripts/install_prereq b/contrib/scripts/install_prereq index afad1f719..1682558ac 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 } |