diff options
author | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-13 03:18:07 +0300 |
---|---|---|
committer | Tuomas Tynkkynen <tuomas@tuxera.com> | 2016-09-13 17:06:13 +0300 |
commit | 246bd302ece734cc0f7f26fa14b72fb9edfdc084 (patch) | |
tree | 4feabaf68a00ff8c38e3e1300ecbc619a9e8b2d3 /pkgs/os-specific | |
parent | 15fa31d33ed9ef805bd35a612d96d0055f04cabf (diff) | |
download | nixpkgs-246bd302ece734cc0f7f26fa14b72fb9edfdc084.tar nixpkgs-246bd302ece734cc0f7f26fa14b72fb9edfdc084.tar.gz nixpkgs-246bd302ece734cc0f7f26fa14b72fb9edfdc084.tar.bz2 nixpkgs-246bd302ece734cc0f7f26fa14b72fb9edfdc084.tar.lz nixpkgs-246bd302ece734cc0f7f26fa14b72fb9edfdc084.tar.xz nixpkgs-246bd302ece734cc0f7f26fa14b72fb9edfdc084.tar.zst nixpkgs-246bd302ece734cc0f7f26fa14b72fb9edfdc084.zip |
kernel generate-config.pl: Be more verbose on errors
Diffstat (limited to 'pkgs/os-specific')
-rw-r--r-- | pkgs/os-specific/linux/kernel/generate-config.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index e5fa780c6e7..3cf1dc34baa 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -91,17 +91,17 @@ sub runConfig { print STDERR "CHOICE: $1, ANSWER: $answer\n" if $debug; print OUT "$answer\n" if $1 =~ /-/; } - + # Some questions lack the option name ("bla bla [Y/n/m/...] "). elsif ($line =~ /(.*) \[(.*)\] ###$/) { print OUT "\n"; } - + else { warn "don't know how to answer this question: $line\n"; print OUT "\n"; } - + $line = ""; %choices = (); } @@ -136,6 +136,6 @@ foreach my $name (sort (keys %answers)) { my $f = $requiredAnswers{$name} && $ENV{'ignoreConfigErrors'} ne "1" ? sub { die "error: " . $_[0]; } : sub { warn "warning: " . $_[0]; }; &$f("unused option: $name\n") unless defined $config{$name}; - &$f("option not set correctly: $name\n") + &$f("option not set correctly: $name (wanted '$answers{$name}', got '$config{$name}')\n") if $config{$name} && $config{$name} ne $answers{$name}; } |