diff options
| author | Kim Lindberger <kim.lindberger@gmail.com> | 2022-02-28 11:37:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-28 11:37:12 +0100 |
| commit | ab7314cb320d9cb7db0688d0f84b3c6b705a3094 (patch) | |
| tree | 7afc55658f1adb552e139724d3dd22f2e1c24c04 /nixos | |
| parent | c53143dd09c2ce04b0a81d36a6b2126497157512 (diff) | |
| parent | b549e7bbb5fa55cacf97b9aa405f73c030cf712b (diff) | |
| download | nixlib-ab7314cb320d9cb7db0688d0f84b3c6b705a3094.tar nixlib-ab7314cb320d9cb7db0688d0f84b3c6b705a3094.tar.gz nixlib-ab7314cb320d9cb7db0688d0f84b3c6b705a3094.tar.bz2 nixlib-ab7314cb320d9cb7db0688d0f84b3c6b705a3094.tar.lz nixlib-ab7314cb320d9cb7db0688d0f84b3c6b705a3094.tar.xz nixlib-ab7314cb320d9cb7db0688d0f84b3c6b705a3094.tar.zst nixlib-ab7314cb320d9cb7db0688d0f84b3c6b705a3094.zip | |
Merge pull request #161507 from talyz/genJqSecretsReplacementSnippet-error-handling
genJqSecretsReplacementSnippet: Fix error handling
Diffstat (limited to 'nixos')
| -rw-r--r-- | nixos/lib/utils.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/nixos/lib/utils.nix b/nixos/lib/utils.nix index 190c4db4d49d..733f9ca522be 100644 --- a/nixos/lib/utils.nix +++ b/nixos/lib/utils.nix @@ -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 = { |