diff options
| author | Ricardo M. Correia <rcorreia@wizy.org> | 2013-08-05 17:59:43 +0000 |
|---|---|---|
| committer | Ricardo M. Correia <rcorreia@wizy.org> | 2013-08-06 02:20:48 +0000 |
| commit | 97056a0620f117d793e1a093ba36ec37456bf5e4 (patch) | |
| tree | a3885f177656dca640ed3796ea3ac3281e6f515a /pkgs/os-specific/linux/kernel/generate-config.pl | |
| parent | 2208c360ac3ed2633b568520803d2887e18d9133 (diff) | |
| download | nixpkgs-97056a0620f117d793e1a093ba36ec37456bf5e4.tar nixpkgs-97056a0620f117d793e1a093ba36ec37456bf5e4.tar.gz nixpkgs-97056a0620f117d793e1a093ba36ec37456bf5e4.tar.bz2 nixpkgs-97056a0620f117d793e1a093ba36ec37456bf5e4.tar.lz nixpkgs-97056a0620f117d793e1a093ba36ec37456bf5e4.tar.xz nixpkgs-97056a0620f117d793e1a093ba36ec37456bf5e4.tar.zst nixpkgs-97056a0620f117d793e1a093ba36ec37456bf5e4.zip | |
linux: properly parse config choice when it's new
Diffstat (limited to 'pkgs/os-specific/linux/kernel/generate-config.pl')
| -rw-r--r-- | pkgs/os-specific/linux/kernel/generate-config.pl | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel/generate-config.pl b/pkgs/os-specific/linux/kernel/generate-config.pl index 05b6867bc55..78663098fb3 100644 --- a/pkgs/os-specific/linux/kernel/generate-config.pl +++ b/pkgs/os-specific/linux/kernel/generate-config.pl @@ -54,8 +54,8 @@ sub runConfig { if ($s eq "\n") { print STDERR "GOT: $line" if $debug; - # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR)"). - if ($line =~ /^\s*>?\s*(\d+)\.\s+.*\(([A-Za-z0-9_]+)\)$/) { + # Remember choice alternatives ("> 1. bla (FOO)" or " 2. bla (BAR) (NEW)"). + if ($line =~ /^\s*>?\s*(\d+)\.\s+.*?\(([A-Za-z0-9_]+)\)(?:\s+\(NEW\))?\s*$/) { $choices{$2} = $1; } |