Hello community,
here is the log from the commit of package bash-completion for openSUSE:Factory
checked in at 2016-02-03 10:17:23
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
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-12-21 12:03:42.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.bash-completion.new/bash-completion.changes
2016-02-03 10:17:24.000000000 +0100
@@ -1,0 +2,6 @@
+Wed Jan 27 15:42:34 UTC 2016 - wer...@suse.de
+
+- Add patch backticks-bsc963140.patch to handle sub commands
+ which will be expanded by backticks (bsc#963140)
+
+-------------------------------------------------------------------
New:
----
backticks-bsc963140.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ bash-completion.spec ++++++
--- /var/tmp/diff_new_pack.PuORxI/_old 2016-02-03 10:17:25.000000000 +0100
+++ /var/tmp/diff_new_pack.PuORxI/_new 2016-02-03 10:17:25.000000000 +0100
@@ -1,7 +1,7 @@
#
# spec file for package bash-completion
#
-# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany.
+# Copyright (c) 2016 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
@@ -45,6 +45,8 @@
Patch8: respect-variables-boo940837.patch
# PATCH-FIX-SUSE boo#958462
Patch9: rm-completion-smart-boo958462.patch
+# PATCH-FIX-SUSE boo#963140
+Patch10: backticks-bsc963140.patch
BuildRequires: pkg-config
Requires: bash
BuildRoot: %{_tmppath}/%{name}-%{version}-build
@@ -66,6 +68,7 @@
%patch7 -b .p7 -p1
%patch8 -b .p8
%patch9 -b .p9
+%patch10 -b .p10 -p1
%build
%configure
++++++ backticks-bsc963140.patch ++++++
---
bash-completion-2.1/bash_completion | 20 ++++++++++++++------
1 file changed, 14 insertions(+), 6 deletions(-)
--- bash-completion-2.1/bash_completion
+++ bash-completion-2.1/bash_completion
@@ -952,13 +952,21 @@ _dollar()
[[ "$COMP_LINE" == cd* ]] && s="/"
case "$1" in
+ \$\(*\))
+ ((glob == 0)) && shopt -u extglob
+ return 0
+ ;;
\$\(*)
- COMPREPLY=($(compgen -c -P '$(' -S ")$s" -- ${1#??}))
- let cmd++
+ COMPREPLY=($(compgen -c -P '$(' -S ")$s" -- ${1:2}))
+ ((${#COMPREPLY[@]} <= 0)) && let cmd++
+ ;;
+ \`*\`)
+ ((glob == 0)) && shopt -u extglob
+ return 0
;;
\`*)
- COMPREPLY=($(compgen -c -P '\`' -S "\`$s" -- ${1#?}))
- let cmd++
+ COMPREPLY=($(compgen -c -P '\`' -S "\`$s" -- ${1:1}))
+ ((${#COMPREPLY[@]} <= 0)) && let cmd++
;;
\$\{*)
COMPREPLY=($(compgen -v -P '${' -S "}$s" -- ${1#??})) ;;
@@ -971,8 +979,8 @@ _dollar()
if ((${#COMPREPLY[@]} > 0)) ; then
((${#COMPREPLY[@]} == 1)) && eval COMPREPLY=\(${COMPREPLY[@]}\)
- elif ((cmd == 0)); then
- eval COMPREPLY=\(${1}\)
+ elif ((cmd > 0)); then
+ compopt -o default -o bashdefault -o nospace
fi
((glob == 0)) && shopt -u extglob
