diff options
| author | johnme <johnme@chromium.org> | 2015-01-06 03:25:52 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-06 11:26:33 +0000 |
| commit | 4bd1030a750284a3c2f75757f7d686f269bf9690 (patch) | |
| tree | 5e3c6698d2fed48c1b359314290926f2f6ba92c7 /build/install-build-deps.sh | |
| parent | 67d1a03057042dfc9bb0a71f9906320ee5204301 (diff) | |
| download | chromium_src-4bd1030a750284a3c2f75757f7d686f269bf9690.zip chromium_src-4bd1030a750284a3c2f75757f7d686f269bf9690.tar.gz chromium_src-4bd1030a750284a3c2f75757f7d686f269bf9690.tar.bz2 | |
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}
Diffstat (limited to 'build/install-build-deps.sh')
| -rwxr-xr-x | build/install-build-deps.sh | 4 |
1 files changed, 3 insertions, 1 deletions
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 |