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

Report errors when opening config files am: 15cd21a492 am: aa14355b6a

Browse Source 
am: 2077c15150

Change-Id: Ia4e8bda652317eed42a9e559f881eddf5a6ada12
This commit is contained in:
Colin Cross
2018-02-27 22:31:05 +00:00
committed by android-build-merger
parent 761955541f 2077c15150
commit 439b95a68b
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/config.go
View File

@@ -132,12 +132,14 @@ func loadFromConfigFile(configurable jsonConfigurable, filename string) error {
if err != nil { if err != nil {
return err return err
} }
} else if err != nil {
return fmt.Errorf("config file: could not open %s: %s", filename, err.Error())
} else { } else {
// Make a decoder for it // Make a decoder for it
jsonDecoder := json.NewDecoder(configFileReader) jsonDecoder := json.NewDecoder(configFileReader)
err = jsonDecoder.Decode(configurable) err = jsonDecoder.Decode(configurable)
if err != nil { if err != nil {
return fmt.Errorf("config file: %s did not parse correctly: "+err.Error(), filename) return fmt.Errorf("config file: %s did not parse correctly: %s", filename, err.Error())
} }
} }