diff options
| author | root <root@rshg054.dnsready.net> | 2013-01-29 00:06:25 -0800 |
|---|---|---|
| committer | root <root@rshg054.dnsready.net> | 2013-01-29 00:06:25 -0800 |
| commit | 2cb7f65fb24926493d457f6931e421e27aa629da (patch) | |
| tree | dfd419375945457b6b6dd74c280812f8e5533743 /community/schroot | |
| parent | 1b9f6dc846379470b620b5dbb9d4d7acd1de148c (diff) | |
Tue Jan 29 00:06:25 PST 2013
Diffstat (limited to 'community/schroot')
| -rw-r--r-- | community/schroot/PKGBUILD | 10 | ||||
| -rw-r--r-- | community/schroot/colon-completion.patch | 32 |
2 files changed, 12 insertions, 30 deletions
diff --git a/community/schroot/PKGBUILD b/community/schroot/PKGBUILD index f9b2fdeb3..94d8666a1 100644 --- a/community/schroot/PKGBUILD +++ b/community/schroot/PKGBUILD @@ -1,10 +1,10 @@ -# $Id: PKGBUILD 81583 2012-12-24 15:02:13Z spupykin $ +# $Id: PKGBUILD 83274 2013-01-28 16:50:07Z stephane $ # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com> # Contributor: Andreas Wagner <Andreas dot Wagner at em dot uni-frankfurt dot de> pkgname=schroot -pkgver=1.6.3 -pkgrel=4 +pkgver=1.6.5 +pkgrel=1 pkgdesc="Allows users to execute shell commands under different root filesystems. (Successor to dchroot)." url="http://packages.qa.debian.org/s/schroot.html" license=('GPL3') @@ -29,14 +29,14 @@ source=("http://ftp.debian.org/debian/pool/main/s/$pkgname/${pkgname}_${pkgver}. 'pam.d.schroot.patch' 'colon-completion.patch' 'fix-bash-completion.patch') -md5sums=('f6b1badef213ce8e9ef37bb3fc213390' +md5sums=('99f679d68f180a56289b3ec40d214ae4' '54239847f89b9a4772910415bde6276a' '5a3f7b839c7e0b8933748da7c5b6385b' 'ddb2f09c02b24dab777110f9808472e1' 'f0d5d5b5e34a860f6f90b5628c680f46' 'af1da6edd8c8c0dafeeb2c2c4e0c840b' 'a8d77cac806a0a9adef3f93cdbeb280a' - '8502fcc9112c2971bcae35373d2ff42f' + 'f0d03bf6c60ed119781b27b98234299c' '5ba775d4f401e2c167414caa548b71e5') build() { diff --git a/community/schroot/colon-completion.patch b/community/schroot/colon-completion.patch index 5cd8f8996..2df1bd16e 100644 --- a/community/schroot/colon-completion.patch +++ b/community/schroot/colon-completion.patch @@ -1,22 +1,7 @@ -From 1563e1ba9bc2b317390ef305ae9af56a4b976940 Mon Sep 17 00:00:00 2001 -From: Peter Wu <lekensteyn@gmail.com> -Date: Sat, 22 Dec 2012 16:37:00 +0100 -Subject: [PATCH] etc: make bash completion work for colon values - ---chroot (and -c) accept values like chroot:foo and session:foo-abc. Standard -bash completion treats colons as whitespace, hence we need a way to force that -off. - -Fix based on http://stackoverflow.com/q/10528695/427545 (thanks Radu Gasler!) ---- - etc/bash_completion/schroot | 4 ++-- - 1 file changed, 2 insertions(+), 2 deletions(-) - -diff --git a/etc/bash_completion/schroot b/etc/bash_completion/schroot -index 035f0b3..7cda29b 100644 ---- a/etc/bash_completion/schroot -+++ b/etc/bash_completion/schroot -@@ -21,14 +21,14 @@ _schroot() +diff -wbBur schroot-1.6.5.org/etc/bash_completion/schroot schroot-1.6.5/etc/bash_completion/schroot +--- schroot-1.6.5.org/etc/bash_completion/schroot 2013-01-28 15:28:04.000000000 +0400 ++++ schroot-1.6.5/etc/bash_completion/schroot 2013-01-28 15:30:22.297213632 +0400 +@@ -21,14 +21,14 @@ local cur prev options COMPREPLY=() @@ -28,11 +13,8 @@ index 035f0b3..7cda29b 100644 options=$(schroot --help | sed 's/\(^\|[[:space:]]\)[^[:space:]-][^[:space:]]*//g') if [ "$prev" = "-c" ] || [ "$prev" = "--chroot" ]; then - COMPREPLY=( $(compgen -W "$(schroot -a -l)" -- $cur) ) -+ __ltrim_colon_completions "$cur" + COMPREPLY=( $(compgen -W "$(schroot -a -l)" -- $cur) ) ++ __ltrim_colon_completions "$cur" else - COMPREPLY=( $(compgen -W "$options" -- $cur) ) + COMPREPLY=( $(compgen -W "$options" -- $cur) ) fi --- -1.8.0.2 - |