[Bash-completion-commits] [debian] 13/19: aptitude_safe-upgrade.patch: safe-upgrade supports package names, thanks to Nicolas Le Cam (Closes: #673235)

[David Paleino]

This is an automated email from the git hooks/post-receive script.

dapal pushed a commit to branch master
in repository debian.

commit dcec90789b1399977709221ce03982ace72c92d9
Author: David Paleino <dapal at debian.org>
Date:   Wed Mar 19 11:20:54 2014 +0100

    aptitude_safe-upgrade.patch: safe-upgrade supports package names, thanks to Nicolas Le Cam (Closes: #673235)
---
 debian/changelog                              |  4 ++-
 debian/patches/09-aptitude_safe-upgrade.patch | 39 +++++++++++++++++++++++++++
 debian/patches/series                         |  1 +
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 4b322cd..73074ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -28,11 +28,13 @@ bash-completion (1:2.1-3) UNRELEASED; urgency=medium
       options in dpkg-deb, thanks to Uwe Storbeck (Closes: #698977)
     - dpkg_fix_-W_option.patch: -W|--show doesn't support udebs/ddebs,
       thanks to Luca Capello (Closes: #697513)
+    - aptitude_safe-upgrade.patch: safe-upgrade supports package names,
+      thanks to Nicolas Le Cam (Closes: #673235)
   * debian/extra/debhelper/dh_bash-completion: fix installation process
     when more than one "proper snippet" is being installed, thanks to
     Jean-Michel Vourgère (Closes: #680852)
 
- -- David Paleino <dapal at debian.org>  Wed, 19 Mar 2014 11:16:47 +0100
+ -- David Paleino <dapal at debian.org>  Wed, 19 Mar 2014 11:20:26 +0100
 
 bash-completion (1:2.1-2) unstable; urgency=low
 
diff --git a/debian/patches/09-aptitude_safe-upgrade.patch b/debian/patches/09-aptitude_safe-upgrade.patch
new file mode 100644
index 0000000..04b2734
--- /dev/null
+++ b/debian/patches/09-aptitude_safe-upgrade.patch
@@ -0,0 +1,39 @@
+From: Nicolas Le Cam <niko.lecam at gmail.com>
+Subject: aptitude safe-upgrade accepts package names
+Forwarded: no
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673235
+Origin: vendor, https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=673235
+
+---
+ completions/aptitude |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
+
+--- bash-completion.orig/completions/aptitude
++++ bash-completion/completions/aptitude
+@@ -26,7 +26,7 @@ _aptitude()
+ 
+     local special i
+     for (( i=0; i < ${#words[@]}-1; i++ )); do
+-        if [[ ${words[i]} == @(@(|re)install|@(|un)hold|@(|un)markauto|@(dist|full)-upgrade|download|show|forbid-version|purge|remove|changelog|why@(|-not)|keep@(|-all)|build-dep|@(add|remove)-user-tag|versions) ]]; then
++        if [[ ${words[i]} == @(@(|re)install|@(|un)hold|@(|un)markauto|@(dist|full|safe)-upgrade|download|show|forbid-version|purge|remove|changelog|why@(|-not)|keep@(|-all)|build-dep|@(add|remove)-user-tag|versions) ]]; then
+             special=${words[i]}
+         fi
+         #exclude some mutually exclusive options
+@@ -38,7 +38,7 @@ _aptitude()
+        case $special in
+            install|hold|markauto|unmarkauto|dist-upgrade|full-upgrade| \
+            download|show|changelog|why|why-not|build-dep|add-user-tag| \
+-           remove-user-tag|versions)
++           remove-user-tag|versions|safe-upgrade)
+                COMPREPLY=( $( apt-cache pkgnames $cur 2> /dev/null ) )
+                return 0
+                ;;
+@@ -56,7 +56,7 @@ _aptitude()
+ 
+     case $prev in
+         # don't complete anything if these options are found
+-        autoclean|clean|forget-new|search|safe-upgrade|upgrade|update|keep-all)
++        autoclean|clean|forget-new|search|upgrade|update|keep-all)
+             return 0
+             ;;
+         -S)
diff --git a/debian/patches/series b/debian/patches/series
index 9617456..0e1cc0d 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@
 06-xpdf_support_compressed_pdf.patch
 07-dpkg_support_raw-extract_vextract.patch
 08-dpkg_fix_-W_option.patch
+09-aptitude_safe-upgrade.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/bash-completion/debian.git