From 4bd1030a750284a3c2f75757f7d686f269bf9690 Mon Sep 17 00:00:00 2001
From: johnme <johnme@chromium.org>
Date: Tue, 6 Jan 2015 03:25:52 -0800
Subject: Fix install-build-deps.sh --quick-check on Trusty

Sort :i386 packages to the front to avoid confusing dpkg-query;
see https://crbug.com/446172 for details.

BUG=446172

Review URL: https://codereview.chromium.org/795253007

Cr-Commit-Position: refs/heads/master@{#310079}
---
 build/install-build-deps.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'build/install-build-deps.sh')

diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh
index d1d844a..cded452 100755
--- a/build/install-build-deps.sh
+++ b/build/install-build-deps.sh
@@ -304,9 +304,11 @@ else
   nacl_list=
 fi
 
+# The `sort -r -s -t: -k2` sorts all the :i386 packages to the front, to avoid
+# confusing dpkg-query (crbug.com/446172).
 packages="$(
   echo "${dev_list} ${lib_list} ${dbg_list} ${lib32_list} ${arm_list}"\
-       "${nacl_list}" | tr " " "\n" | sort -u | tr "\n" " "
+       "${nacl_list}" | tr " " "\n" | sort -u | sort -r -s -t: -k2 | tr "\n" " "
 )"
 
 if [ 1 -eq "${do_quick_check-0}" ] ; then
-- 
cgit v1.1