Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit aa14355b authored by Colin Cross's avatar Colin Cross Committed by android-build-merger
Browse files

Report errors when opening config files

am: 15cd21a4

Change-Id: I3625ab981fae0c9d647c5a1c37d67e7807c68264
parents 113265ec 15cd21a4
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -132,12 +132,14 @@ func loadFromConfigFile(configurable jsonConfigurable, filename string) error {
		if err != nil {
			return err
		}
	} else if err != nil {
		return fmt.Errorf("config file: could not open %s: %s", filename, err.Error())
	} else {
		// Make a decoder for it
		jsonDecoder := json.NewDecoder(configFileReader)
		err = jsonDecoder.Decode(configurable)
		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())
		}
	}