Hello community,

here is the log from the commit of package bash-completion for openSUSE:Factory 
checked in at 2015-08-17 15:33:48
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/bash-completion (Old)
 and      /work/SRC/openSUSE:Factory/.bash-completion.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "bash-completion"

Changes:
--------
--- /work/SRC/openSUSE:Factory/bash-completion/bash-completion.changes  
2015-07-05 17:57:26.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.bash-completion.new/bash-completion.changes     
2015-08-17 15:33:50.000000000 +0200
@@ -1,0 +2,11 @@
+Thu Aug 13 06:53:15 UTC 2015 - wer...@suse.de
+
+- Add patch backtick-completion-boo940835.patch to allow correct
+  backtick completion (boo#940835) 
+
+-------------------------------------------------------------------
+Wed Aug 12 13:17:40 UTC 2015 - wer...@suse.de
+
+- Correct typo in patch ls-completion-boo889319.patch 
+
+-------------------------------------------------------------------

New:
----
  backtick-completion-boo940835.patch

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ bash-completion.spec ++++++
--- /var/tmp/diff_new_pack.wNUs0N/_old  2015-08-17 15:33:51.000000000 +0200
+++ /var/tmp/diff_new_pack.wNUs0N/_new  2015-08-17 15:33:51.000000000 +0200
@@ -1,7 +1,7 @@
 #
 # spec file for package bash-completion
 #
-# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany.
+# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -37,6 +37,8 @@
 Patch4:         init-completion-boo922758.patch
 # PATCH-FIX-SUSE boo#889319
 Patch5:         ls-completion-boo889319.patch
+# PATCH-FIX-SUSE boo#940835
+Patch6:         backtick-completion-boo940835.patch
 BuildRequires:  pkg-config
 Requires:       bash
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
@@ -54,6 +56,7 @@
 %patch3 -b .p3
 %patch4 -b .p4
 %patch5 -b .p5
+%patch6 -b .p6
 
 %build
 %configure

++++++ backtick-completion-boo940835.patch ++++++
---
 bash_completion |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

--- bash_completion
+++ bash_completion     2015-08-13 06:50:46.873519910 +0000
@@ -945,16 +945,21 @@ _tilde()
 _dollar()
 {
     local s=""
-    local -i glob=0
-
+    local -i glob=0 cmd=0
     shopt -q extglob && let glob++
     ((glob == 0)) && shopt -s extglob
 
     [[ "$COMP_LINE" == cd* ]] && s="/"
 
     case "$1" in
-    \$\(*|\`*)
-        COMPREPLY=($(compgen -c -P '$(' -S ")$s" -- ${1#??})) ;;
+    \$\(*)
+        COMPREPLY=($(compgen -c -P '$(' -S ")$s" -- ${1#??}))
+        let cmd++
+        ;;
+    \`*)
+        COMPREPLY=($(compgen -c -P '\`' -S "\`$s" -- ${1#?}))
+        let cmd++
+        ;;
     \$\{*)
         COMPREPLY=($(compgen -v -P '${' -S "}$s" -- ${1#??})) ;;
     \$*)
@@ -966,7 +971,7 @@ _dollar()
 
     if ((${#COMPREPLY[@]} > 0)) ; then
         ((${#COMPREPLY[@]} == 1)) && eval COMPREPLY=\(${COMPREPLY[@]}\)
-    else
+    elif ((cmd == 0)); then
         eval COMPREPLY=\(${1}\)
     fi
 
++++++ ls-completion-boo889319.patch ++++++
--- /var/tmp/diff_new_pack.wNUs0N/_old  2015-08-17 15:33:51.000000000 +0200
+++ /var/tmp/diff_new_pack.wNUs0N/_new  2015-08-17 15:33:51.000000000 +0200
@@ -9,7 +9,7 @@
  }
  # makeinfo and texi2dvi are defined elsewhere.
 -complete -F _longopt -o filenames a2ps awk base64 bash bc bison cat colordiff 
cp csplit \
-+complete -F _longopt filenames a2ps awk base64 bash bc bison cat colordiff cp 
csplit \
++complete -F _longopt -o filenames a2ps awk base64 bash bc bison cat colordiff 
cp csplit \
      cut date df diff dir du enscript expand fmt fold gperf \
 -    grep grub head indent irb ld ldd less ln ls m4 md5sum mkdir mkfifo mknod \
 +    grep grub head indent irb ld ldd less ln m4 md5sum mkdir mkfifo mknod \


Reply via email to