Skip to content

Commit 40e8e3a

Browse files
committed
Fix unintended name shadowing
1 parent 9de7673 commit 40e8e3a

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

cmd/helm3.go

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -145,11 +145,12 @@ func (d *diffCmd) template(isUpgrade bool) ([]byte, error) {
145145
}()
146146
// In the presence of --reuse-values (or --reset-values), --reset-then-reuse-values is ignored.
147147
if d.resetThenReuseValues && !d.reuseValues {
148-
resetThenReuseValuesIsSupported, err := isHelmVersionAtLeast(minHelmVersionWithResetThenReuseValues)
148+
var supported bool
149+
supported, err = isHelmVersionAtLeast(minHelmVersionWithResetThenReuseValues)
149150
if err != nil {
150151
return nil, err
151152
}
152-
if !resetThenReuseValuesIsSupported {
153+
if !supported {
153154
return nil, fmt.Errorf("Using --reset-then-reuse-values requires at least helm version %s", minHelmVersionWithResetThenReuseValues.String())
154155
}
155156
err = d.writeExistingValues(tmpfile, false)

0 commit comments

Comments
 (0)