diff options
| author | Peter Simons <simons@cryp.to> | 2015-02-12 20:33:21 +0100 |
|---|---|---|
| committer | Peter Simons <simons@cryp.to> | 2015-02-12 20:33:21 +0100 |
| commit | 3d8b3fe2533b5f5e5665506516b2508bef57530d (patch) | |
| tree | f38269a9b2d4fc9bf58d2697161d3ebd061274b9 /pkgs/shells | |
| parent | 0893fc1e7be1aea05830ca9b42991ced89174234 (diff) | |
| parent | 20ab4027da00019de2c2df5fb97f6dd1ae82de17 (diff) | |
| download | nixpkgs-3d8b3fe2533b5f5e5665506516b2508bef57530d.tar nixpkgs-3d8b3fe2533b5f5e5665506516b2508bef57530d.tar.gz nixpkgs-3d8b3fe2533b5f5e5665506516b2508bef57530d.tar.bz2 nixpkgs-3d8b3fe2533b5f5e5665506516b2508bef57530d.tar.lz nixpkgs-3d8b3fe2533b5f5e5665506516b2508bef57530d.tar.xz nixpkgs-3d8b3fe2533b5f5e5665506516b2508bef57530d.tar.zst nixpkgs-3d8b3fe2533b5f5e5665506516b2508bef57530d.zip | |
Merge pull request #6319 from sorokin/master
bash-completion: fix bad array subscript error. Closes #6117
Diffstat (limited to 'pkgs/shells')
| -rw-r--r-- | pkgs/shells/bash-completion/bash-4.3.patch | 22 | ||||
| -rw-r--r-- | pkgs/shells/bash-completion/default.nix | 2 |
2 files changed, 24 insertions, 0 deletions
diff --git a/pkgs/shells/bash-completion/bash-4.3.patch b/pkgs/shells/bash-completion/bash-4.3.patch new file mode 100644 index 00000000000..e893b501d31 --- /dev/null +++ b/pkgs/shells/bash-completion/bash-4.3.patch @@ -0,0 +1,22 @@ +commit a9c556ccad819869a6a5d932aac0a75a99372f08 +Author: Barry Warsaw <barry@python.org> +Date: Wed Sep 17 19:32:43 2014 +0300 + + _init_completion: Handle cword < 0 (LP: #1289597) + + Previously only bash 4.3 seemed to provoke this, but now with the + empty command consistency tweak it occurs with earlier as well. + +diff --git a/bash_completion b/bash_completion +index 7e01ae4..3bb4bc2 100644 +--- a/bash_completion ++++ b/bash_completion +@@ -727,7 +727,7 @@ _init_completion() + fi + done + +- [[ $cword -eq 0 ]] && return 1 ++ [[ $cword -le 0 ]] && return 1 + prev=${words[cword-1]} + + [[ ${split-} ]] && _split_longopt && split=true diff --git a/pkgs/shells/bash-completion/default.nix b/pkgs/shells/bash-completion/default.nix index a189ed29d8c..39f7073fcbb 100644 --- a/pkgs/shells/bash-completion/default.nix +++ b/pkgs/shells/bash-completion/default.nix @@ -8,6 +8,8 @@ stdenv.mkDerivation rec { sha256 = "0kxf8s5bw7y50x0ksb77d3kv0dwadixhybl818w27y6mlw26hq1b"; }; + patches = [ ./bash-4.3.patch ]; + doCheck = true; meta = { |