Merge pull request #116 from AXOOM/master
Fix resolving relative paths on windows
This commit is contained in:
		
						commit
						d8465c4ca5
					
				|  | @ -15,7 +15,6 @@ import ( | ||||||
| 	"github.com/roboll/helmfile/helmexec" | 	"github.com/roboll/helmfile/helmexec" | ||||||
| 
 | 
 | ||||||
| 	"bytes" | 	"bytes" | ||||||
| 	"path" |  | ||||||
| 	"regexp" | 	"regexp" | ||||||
| 
 | 
 | ||||||
| 	yaml "gopkg.in/yaml.v1" | 	yaml "gopkg.in/yaml.v1" | ||||||
|  | @ -91,7 +90,7 @@ func ReadFromFile(file string) (*HelmState, error) { | ||||||
| func readFromYaml(content []byte, file string) (*HelmState, error) { | func readFromYaml(content []byte, file string) (*HelmState, error) { | ||||||
| 	var state HelmState | 	var state HelmState | ||||||
| 
 | 
 | ||||||
| 	state.BaseChartPath, _ = filepath.Abs(path.Dir(file)) | 	state.BaseChartPath, _ = filepath.Abs(filepath.Dir(file)) | ||||||
| 	if err := yaml.Unmarshal(content, &state); err != nil { | 	if err := yaml.Unmarshal(content, &state); err != nil { | ||||||
| 		return nil, err | 		return nil, err | ||||||
| 	} | 	} | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue