summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnthony HAMON <anthony.hamon@iadvize.com>2018-08-21 08:41:31 +0200
committerAnthony HAMON <anthony.hamon@iadvize.com>2018-08-21 20:54:48 +0200
commit37681627ab46bc97af6cffcc812dadfe98c0852b (patch)
tree755358c937261f043cc65fdd68f18c1bd23468c1
parent810155ef2f8c1e34c3f67aa95dbde9dcb342bb8a (diff)
remove useless check
-rw-r--r--pkg/config/app_config.go10
-rw-r--r--pkg/test/test.go6
2 files changed, 4 insertions, 12 deletions
diff --git a/pkg/config/app_config.go b/pkg/config/app_config.go
index 9f258d4a6..aa56365e3 100644
--- a/pkg/config/app_config.go
+++ b/pkg/config/app_config.go
@@ -121,10 +121,7 @@ func LoadUserConfigFromFile(v *viper.Viper) error {
folder = configDirs.QueryFolderContainsFile("config.yml")
}
v.AddConfigPath(folder.Path)
- if err := v.MergeInConfig(); err != nil {
- return err
- }
- return nil
+ return v.MergeInConfig()
}
// InsertToUserConfig adds a key/value pair to the user's config and saves it
@@ -139,10 +136,7 @@ func (c *AppConfig) InsertToUserConfig(key, value string) error {
return err
}
v.Set(key, value)
- if err := v.WriteConfig(); err != nil {
- return err
- }
- return nil
+ return v.WriteConfig()
}
func getDefaultConfig() []byte {
diff --git a/pkg/test/test.go b/pkg/test/test.go
index 7bdbd4c10..b5da22903 100644
--- a/pkg/test/test.go
+++ b/pkg/test/test.go
@@ -18,8 +18,6 @@ func GenerateRepo(filename string) error {
if output, err := exec.Command("bash", filename).CombinedOutput(); err != nil {
return errors.New(string(output))
}
- if err := os.Chdir(testPath + "repo"); err != nil {
- return err
- }
- return nil
+
+ return os.Chdir(testPath + "repo")
}