public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #48153 from Ma27/fix-nixos-option-for-invalid-options

Browse Source 
nixos-option: don't abort with shell failures if options are not existant
This commit is contained in:
Danylo Hlynskyi
2019-01-24 02:38:02 +02:00
committed by GitHub
parent bfcfa77ba0 a866551226
commit 0abf181066
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
nixos/modules/installer/tools/nixos-option.sh
+3 -3
View File
@@ -314,13 +314,13 @@ else
# echo 1>&2 "Warning: This value is not an option." # echo 1>&2 "Warning: This value is not an option."
result=$(evalCfg "") result=$(evalCfg "")
if names=$(attrNames "$result" 2> /dev/null); then if [ ! -z "$result" ]; then
names=$(attrNames "$result" 2> /dev/null)
echo 1>&2 "This attribute set contains:" echo 1>&2 "This attribute set contains:"
escapeQuotes () { eval echo "$1"; } escapeQuotes () { eval echo "$1"; }
nixMap escapeQuotes "$names" nixMap escapeQuotes "$names"
else else
echo 1>&2 "An error occurred while looking for attribute names." echo 1>&2 "An error occurred while looking for attribute names. Are you sure that '$option' exists?"
echo $result
fi fi
fi fi