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

Merge "Improve error handling around username/hostname" am: 784a53ce37

Browse Source 
Change-Id: I5193e81be8edafc0f5158e03b5f1fefb476d747f
This commit is contained in:
Automerger Merge Worker
2020-03-11 02:26:21 +00:00
parent 08e4d84e03 784a53ce37
commit a1dd6c7fb8
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ui/build/kati.go
View File

@@ -104,17 +104,20 @@ func runKati(ctx Context, config Config, extraSuffix string, args []string, envF
envFunc(cmd.Environment) envFunc(cmd.Environment)
if _, ok := cmd.Environment.Get("BUILD_USERNAME"); !ok { if _, ok := cmd.Environment.Get("BUILD_USERNAME"); !ok {
u, err := user.Current() username := "unknown"
if err != nil { if u, err := user.Current(); err == nil {
ctx.Println("Failed to get current user") username = u.Username
} else {
ctx.Println("Failed to get current user:", err)
} }
cmd.Environment.Set("BUILD_USERNAME", u.Username) cmd.Environment.Set("BUILD_USERNAME", username)
} }
if _, ok := cmd.Environment.Get("BUILD_HOSTNAME"); !ok { if _, ok := cmd.Environment.Get("BUILD_HOSTNAME"); !ok {
hostname, err := os.Hostname() hostname, err := os.Hostname()
if err != nil { if err != nil {
ctx.Println("Failed to read hostname") ctx.Println("Failed to read hostname:", err)
hostname = "unknown"
} }
cmd.Environment.Set("BUILD_HOSTNAME", hostname) cmd.Environment.Set("BUILD_HOSTNAME", hostname)
} }