Merge branch 'master' into enable-extra-port

Shlomi Noach · web-flow · commit 422571308f4d · 2017-09-14T12:17:24.000+03:00
diff --git a/RELEASE_VERSION b/RELEASE_VERSION
@@ -1 +1 @@
-1.0.40
+1.0.42
diff --git a/go/base/context.go b/go/base/context.go
@@ -700,7 +700,7 @@ func (this *MigrationContext) ReadConfigFile() error {
 	gcfg.RelaxedParserMode = true
 	gcfgscanner.RelaxedScannerMode = true
 	if err := gcfg.ReadFileInto(&this.config, this.ConfigFile); err != nil {
-		return err
+		return fmt.Errorf("Error reading config file %s. Details: %s", this.ConfigFile, err.Error())
 	}
 
 	// We accept user & password in the form "${SOME_ENV_VARIABLE}" in which case we pull

Original file line number	Diff line number	Diff line change
`@@ -700,7 +700,7 @@ func (this *MigrationContext) ReadConfigFile() error {`
`700`	`700`	`gcfg.RelaxedParserMode = true`
`701`	`701`	`gcfgscanner.RelaxedScannerMode = true`
`702`	`702`	`if err := gcfg.ReadFileInto(&this.config, this.ConfigFile); err != nil {`
`703`		`- return err`
	`703`	`+ return fmt.Errorf("Error reading config file %s. Details: %s", this.ConfigFile, err.Error())`
`704`	`704`	`}`
`705`	`705`
`706`	`706`	`// We accept user & password in the form "${SOME_ENV_VARIABLE}" in which case we pull`