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

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
commit 0abf181066
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -314,13 +314,13 @@ else
# echo 1>&2 "Warning: This value is not an option."
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:"
escapeQuotes () { eval echo "$1"; }
nixMap escapeQuotes "$names"
else
echo 1>&2 "An error occurred while looking for attribute names."
echo $result
echo 1>&2 "An error occurred while looking for attribute names. Are you sure that '$option' exists?"
fi
fi