build/install-build-deps.sh - Issue 693943003: Update from https://crrev.com/302630

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: build/install-build-deps.sh

Issue 693943003: Update from https://crrev.com/302630 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 6 years, 1 month ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: build/install-build-deps.sh

diff --git a/build/install-build-deps.sh b/build/install-build-deps.sh

index 36dd9c4a278ff14fbe58a5e4238f788022baceb5..f28409bc092bd7d2f952a441bf7ca34f94ad9379 100755

--- a/build/install-build-deps.sh

+++ b/build/install-build-deps.sh

@@ -160,7 +160,7 @@ nacl_list="g++-mingw-w64-i686 lib32z1-dev

# Hence we must match the same version or this entire script will fail.

mesa_variant=""

for variant in "-lts-quantal" "-lts-raring" "-lts-saucy" "-lts-trusty"; do

- if $(dpkg-query -Wf'${Status}' libgl1-mesa-glx${variant} | \

+ if $(dpkg-query -Wf'${Status}' libgl1-mesa-glx${variant} 2>/dev/null | \

grep -q " ok installed"); then

mesa_variant="${variant}"

« no previous file with comments | « build/go/rules.gni ('k') | build/ios/grit_whitelist.txt » ('j') | no next file with comments »