StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Use ctx.Fatalln instead of log.Fatalln for absolute path errors"

Browse Source
This commit is contained in:
Colin Cross
2019-09-26 17:18:49 +00:00
committed by Gerrit Code Review
parent d08d5c9de1 1f6faeb50f
commit 505bcb88ed
1 changed files with 15 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
ui/build/config.go
View File

@@ -16,7 +16,6 @@ package build
import ( import (
"io/ioutil" "io/ioutil"
"log"
"os" "os"
"path/filepath" "path/filepath"
"runtime" "runtime"
@@ -189,27 +188,27 @@ func NewConfig(ctx Context, args ...string) Config {
checkTopDir(ctx) checkTopDir(ctx)
if srcDir := absPath(ctx, "."); strings.ContainsRune(srcDir, ' ') { if srcDir := absPath(ctx, "."); strings.ContainsRune(srcDir, ' ') {
log.Println("You are building in a directory whose absolute path contains a space character:") ctx.Println("You are building in a directory whose absolute path contains a space character:")
log.Println() ctx.Println()
log.Printf("%q\n", srcDir) ctx.Printf("%q\n", srcDir)
log.Println() ctx.Println()
log.Fatalln("Directory names containing spaces are not supported") ctx.Fatalln("Directory names containing spaces are not supported")
} }
if outDir := ret.OutDir(); strings.ContainsRune(outDir, ' ') { if outDir := ret.OutDir(); strings.ContainsRune(outDir, ' ') {
log.Println("The absolute path of your output directory ($OUT_DIR) contains a space character:") ctx.Println("The absolute path of your output directory ($OUT_DIR) contains a space character:")
log.Println() ctx.Println()
log.Printf("%q\n", outDir) ctx.Printf("%q\n", outDir)
log.Println() ctx.Println()
log.Fatalln("Directory names containing spaces are not supported") ctx.Fatalln("Directory names containing spaces are not supported")
} }
if distDir := ret.DistDir(); strings.ContainsRune(distDir, ' ') { if distDir := ret.DistDir(); strings.ContainsRune(distDir, ' ') {
log.Println("The absolute path of your dist directory ($DIST_DIR) contains a space character:") ctx.Println("The absolute path of your dist directory ($DIST_DIR) contains a space character:")
log.Println() ctx.Println()
log.Printf("%q\n", distDir) ctx.Printf("%q\n", distDir)
log.Println() ctx.Println()
log.Fatalln("Directory names containing spaces are not supported") ctx.Fatalln("Directory names containing spaces are not supported")
} }
// Configure Java-related variables, including adding it to $PATH // Configure Java-related variables, including adding it to $PATH