From d3bb50ba990120fb316f9ea0710b5f26a88eb108 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Sat, 26 Dec 2015 19:37:05 +0100 Subject: Add patch to fix parsing of aptitude 0.7.5's --help output MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit … without stopping to be able parse older aptitude versions' output. --- .../fix-aptitude-completion-for-0.7.5-807906.patch | 17 +++++++++++++++++ debian/patches/series | 1 + 2 files changed, 18 insertions(+) create mode 100644 debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch diff --git a/debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch b/debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch new file mode 100644 index 000000000..0da989d05 --- /dev/null +++ b/debian/patches/fix-aptitude-completion-for-0.7.5-807906.patch @@ -0,0 +1,17 @@ +Description: Also parse --help output of aptitude 0.7.5 and later +Author: Axel Beckert +Bug-Debian: https://bugs.debian.org/807906 + +Index: zsh/Completion/Debian/Command/_aptitude +=================================================================== +--- zsh.orig/Completion/Debian/Command/_aptitude 2015-09-08 23:39:06.026975805 +0200 ++++ zsh/Completion/Debian/Command/_aptitude 2015-12-26 19:26:14.681265798 +0100 +@@ -80,7 +80,7 @@ + + case $state in + cmds) +- cmds=( ${${(M)${(f)"$(LC_ALL=C _call_program commands aptitude -h 2>/dev/null)"}:#* - *}/(#b) (*[^ ]) #- (*)/$match[1]:$match[2]:l}) ++ cmds=( ${${(M)${(f)"$(LC_ALL=C _call_program commands aptitude -h 2>/dev/null)"}:# [^- ][^ ]## *}/(#b) ([^ ]##) ##(- )#([^- ]*)/$match[1]:$match[3]:l}) + + _describe -t commands 'aptitude command' cmds && ret=0 + ;; diff --git a/debian/patches/series b/debian/patches/series index 877edc424..7fa517010 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,2 +1,3 @@ further-mitigate-test-suite-hangs.patch update-apt-completion-808317.patch +fix-aptitude-completion-for-0.7.5-807906.patch -- cgit v1.2.3