Skip to content

Commit

Permalink
Fix order of respecting settings
Browse files Browse the repository at this point in the history
  • Loading branch information
maximbaz committed Mar 16, 2019
1 parent cbbf6b7 commit 45d63b9
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions request/fetch.go
Original file line number Diff line number Diff line change
Expand Up @@ -65,11 +65,11 @@ func fetchDecryptedContents(request *request) {
store.Path = normalizedStorePath

var gpgPath string
if store.Settings.GpgPath != "" || request.Settings.GpgPath != "" {
if store.Settings.GpgPath != "" {
gpgPath = store.Settings.GpgPath
} else {
if request.Settings.GpgPath != "" || store.Settings.GpgPath != "" {
if request.Settings.GpgPath != "" {
gpgPath = request.Settings.GpgPath
} else {
gpgPath = store.Settings.GpgPath
}
err = validateGpgBinary(gpgPath)
if err != nil {
Expand Down

0 comments on commit 45d63b9

Please sign in to comment.