Skip to content

Commit 29f79b7

Browse files
whs-dot-hkblaggacao
authored andcommitted
Move to a better location
1 parent 086a742 commit 29f79b7

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

src/std/fwlib/blockTypes/kubectl.nix

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -151,13 +151,11 @@ in
151151
export KUBECTL_EXTERNAL_DIFF
152152
153153
diff() {
154-
set +o errexit
155154
kubectl diff --server-side=true --field-manager="std-action-$(whoami)" ${
156155
if usesKustomize
157156
then "--kustomize"
158157
else "--recursive --filename"
159158
} "$manifest_path/";
160-
set -o errexit
161159
162160
return $?;
163161
}
@@ -170,8 +168,10 @@ in
170168
} "$manifest_path/";
171169
}
172170
171+
set +o errexit
173172
diff
174173
ret=$?
174+
set -o errexit
175175
if [[ $ret == 0 ]] || [[ $ret == 1 ]]; then
176176
${askUserToProceedSnippet "apply" "run"}
177177
fi

0 commit comments

Comments
 (0)