pyrox.dev / nixpkgs
lol
fork atom

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

genJqSecretsReplacementSnippet: Fix error handling

authored by Kim Lindberger and committed by GitHub ab7314cb c53143dd

+3 -2
unified split
+3 -2
nixos/lib/utils.nix
··· 150 rm '${output}' 151 fi 152 153 - inherit_errexit_restore=$(shopt -p inherit_errexit) 154 shopt -s inherit_errexit 155 '' 156 + concatStringsSep ··· 170 ' <<'EOF' 171 ${builtins.toJSON set} 172 EOF 173 - $inherit_errexit_restore 174 ''; 175 176 systemdUtils = {
··· 150 rm '${output}' 151 fi 152 153 + inherit_errexit_enabled=0 154 + shopt -pq inherit_errexit && inherit_errexit_enabled=1 155 shopt -s inherit_errexit 156 '' 157 + concatStringsSep ··· 171 ' <<'EOF' 172 ${builtins.toJSON set} 173 EOF 174 + (( ! $inherit_errexit_enabled )) && shopt -u inherit_errexit 175 ''; 176 177 systemdUtils = {