diff options
| author | Colin Cross <ccross@android.com> | 2019-09-23 15:52:40 -0700 |
|---|---|---|
| committer | Luca Stefani <luca.stefani.ge1@gmail.com> | 2019-09-26 19:29:24 +0200 |
| commit | b073f3cd7bf3af2e4220a83d2627234bd08315cf (patch) | |
| tree | fa6c0216d6a30d9e5fd4b352091993836149fde0 | |
| parent | 9d0376d94d2a29e306929b847e026c1660751465 (diff) | |
| download | build_soong-b073f3cd7bf3af2e4220a83d2627234bd08315cf.tar.gz build_soong-b073f3cd7bf3af2e4220a83d2627234bd08315cf.tar.bz2 build_soong-b073f3cd7bf3af2e4220a83d2627234bd08315cf.zip | |
Use ctx.Fatalln instead of log.Fatalln for absolute path errors
log.Fatalln calls os.Exit, which skips deferred functions and
leaves the console with the cursor disabled. Use ctx.Fatalln
instead, which uses a panic to exit and calls the deferred
function to restore the cursor.
Test: DIST_DIR=/tmp/\test\ foo m dist
Change-Id: Ie92297075e37c171d5ba48848a0ddb19652b051c
| -rw-r--r-- | ui/build/config.go | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/ui/build/config.go b/ui/build/config.go index 720235e8..954454bc 100644 --- a/ui/build/config.go +++ b/ui/build/config.go @@ -16,7 +16,6 @@ package build import ( "io/ioutil" - "log" "os" "path/filepath" "runtime" @@ -185,27 +184,27 @@ func NewConfig(ctx Context, args ...string) Config { checkTopDir(ctx) if srcDir := absPath(ctx, "."); strings.ContainsRune(srcDir, ' ') { - log.Println("You are building in a directory whose absolute path contains a space character:") - log.Println() - log.Printf("%q\n", srcDir) - log.Println() - log.Fatalln("Directory names containing spaces are not supported") + ctx.Println("You are building in a directory whose absolute path contains a space character:") + ctx.Println() + ctx.Printf("%q\n", srcDir) + ctx.Println() + ctx.Fatalln("Directory names containing spaces are not supported") } if outDir := ret.OutDir(); strings.ContainsRune(outDir, ' ') { - log.Println("The absolute path of your output directory ($OUT_DIR) contains a space character:") - log.Println() - log.Printf("%q\n", outDir) - log.Println() - log.Fatalln("Directory names containing spaces are not supported") + ctx.Println("The absolute path of your output directory ($OUT_DIR) contains a space character:") + ctx.Println() + ctx.Printf("%q\n", outDir) + ctx.Println() + ctx.Fatalln("Directory names containing spaces are not supported") } if distDir := ret.DistDir(); strings.ContainsRune(distDir, ' ') { - log.Println("The absolute path of your dist directory ($DIST_DIR) contains a space character:") - log.Println() - log.Printf("%q\n", distDir) - log.Println() - log.Fatalln("Directory names containing spaces are not supported") + ctx.Println("The absolute path of your dist directory ($DIST_DIR) contains a space character:") + ctx.Println() + ctx.Printf("%q\n", distDir) + ctx.Println() + ctx.Fatalln("Directory names containing spaces are not supported") } // Configure Java-related variables, including adding it to $PATH |