Merge pull request #161507 from talyz/genJqSecretsReplacementSnippet-error-handling

genJqSecretsReplacementSnippet: Fix error handling
This commit is contained in:
Kim Lindberger 2022-02-28 11:37:12 +01:00 committed by GitHub
commit ab7314cb32
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -150,7 +150,8 @@ rec {
rm '${output}'
fi
inherit_errexit_restore=$(shopt -p inherit_errexit)
inherit_errexit_enabled=0
shopt -pq inherit_errexit && inherit_errexit_enabled=1
shopt -s inherit_errexit
''
+ concatStringsSep
@ -170,7 +171,7 @@ rec {
' <<'EOF'
${builtins.toJSON set}
EOF
$inherit_errexit_restore
(( ! $inherit_errexit_enabled )) && shopt -u inherit_errexit
'';
systemdUtils = {