From 6b3a0ddf0bf0566ffa0db723044e2926de85447c Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Tue, 30 Apr 2019 22:19:26 -0700 Subject: [PATCH] xz: force use of the prebuilt. Also comment why we can't yet do the same for bzip2. Test: treehugger Change-Id: I34d5bc0076f5790fcb01c185ef6d08824a4f6142 --- ui/build/paths/config.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/ui/build/paths/config.go b/ui/build/paths/config.go index ed2d9cab1..f965f245a 100644 --- a/ui/build/paths/config.go +++ b/ui/build/paths/config.go @@ -74,8 +74,10 @@ func GetConfig(name string) PathConfig { } var Configuration = map[string]PathConfig{ - "bash": Allowed, - "bc": Allowed, + "bash": Allowed, + "bc": Allowed, + // We need bzip2 here even though we provide a bzip2 binary because + // GNU tar seems to avoid calling ours. "bzip2": Allowed, "date": Allowed, "dd": Allowed, @@ -104,7 +106,6 @@ var Configuration = map[string]PathConfig{ "timeout": Allowed, "tr": Allowed, "unzip": Allowed, - "xz": Allowed, "zip": Allowed, "zipinfo": Allowed,