[packages/lxc-docker] patch for bash-completions 2.0
glen
glen at pld-linux.org
Wed Aug 28 09:06:59 CEST 2013
commit 044682cac9d38b97e812d9acce22d11ea89e7156
Author: Elan Ruusamäe <glen at delfi.ee>
Date: Wed Aug 28 10:05:19 2013 +0300
patch for bash-completions 2.0
in bash-completions 2.x have() is not exported for lazy-loaded methods,
so either the completion shoould be installed to always-loaded
/etc/bash_completion.d/ dir or use _have(). i chose to stick to the
lazy-load mode.
bash-comp-2.patch | 20 ++++++++++++++++++++
lxc-docker.spec | 2 ++
2 files changed, 22 insertions(+)
---
diff --git a/lxc-docker.spec b/lxc-docker.spec
index ac4eee5..9a47f0f 100644
--- a/lxc-docker.spec
+++ b/lxc-docker.spec
@@ -23,6 +23,7 @@ Source4: https://github.com/dotcloud/tar/archive/master.tar.gz?/tar.tgz
# $ PKG=code.google.com/p/go.net/ REV=84a4013f96e0; hg clone http://$PKG go.net && cd go.net && hg checkout $REV && cd .. && tar -cjf go.net.tar.gz2 --exclude-vcs go.net
Source5: go.net.tar.bz2
# Source5-md5: c8fd9d068430ddfa42d28d4772260eda
+Patch0: bash-comp-2.patch
URL: http://github.com/dotcloud/docker
BuildRequires: golang >= 1.1
Requires: iptables
@@ -65,6 +66,7 @@ Pakiet ten dostarcza bashowe uzupełnianie nazw dla Dockera.
%prep
%setup -q -n docker-%{version} -a1 -a2 -a3 -a4 -a5
cp -p %{SOURCE100} .
+%patch0 -p1
# handle external deps offline, these are taken from Dockerfile
install -d .gopath/src/github.com/{gorilla,kr,dotcloud}
diff --git a/bash-comp-2.patch b/bash-comp-2.patch
new file mode 100644
index 0000000..469a7fc
--- /dev/null
+++ b/bash-comp-2.patch
@@ -0,0 +1,20 @@
+--- docker-0.6.1/contrib/docker.bash~ 2013-08-24 01:23:30.000000000 +0300
++++ docker-0.6.1/contrib/docker.bash 2013-08-28 10:03:57.739906253 +0300
+@@ -10,6 +10,8 @@
+ #
+ # To enable the completions either:
+ # - place this file in /etc/bash_completion.d
++# or for bash-completions 2.0
++# - place this file in /usr/share/bash-completion/completions
+ # or
+ # - copy this file and add the line below to your .bashrc after
+ # bash completion features are loaded
+@@ -21,7 +23,7 @@
+ # If the docker daemon is using a unix socket for communication your user
+ # must have access to the socket for the completions to function correctly
+
+-have docker && {
++_have docker && {
+ __docker_containers_all()
+ {
+ local containers
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/lxc-docker.git/commitdiff/044682cac9d38b97e812d9acce22d11ea89e7156
More information about the pld-cvs-commit
mailing list