diff options
author | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-04 12:05:33 -0300 |
---|---|---|
committer | Nicolas Reynolds <fauno@kiwwwi.com.ar> | 2012-01-04 12:05:33 -0300 |
commit | 572db5155dc23eb1c4f65736b9ca5507eed6fbd2 (patch) | |
tree | 687a7c5627b76004103420d1575528fbfc0ff4b7 /extra/zsh/svn-1.7.patch | |
parent | ca2e05bb7791418f2af678704160d56d8184a21a (diff) | |
parent | d1d68784dc66793601c239fa64cc0e02ebd9444e (diff) |
Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el
Conflicts:
kde-unstable/kdemultimedia/PKGBUILD
libre/mplayer-libre/PKGBUILD
social/diaspora-git/PKGBUILD
staging/php/PKGBUILD
staging/redland/PKGBUILD
Diffstat (limited to 'extra/zsh/svn-1.7.patch')
-rw-r--r-- | extra/zsh/svn-1.7.patch | 34 |
1 files changed, 34 insertions, 0 deletions
diff --git a/extra/zsh/svn-1.7.patch b/extra/zsh/svn-1.7.patch new file mode 100644 index 000000000..5ef314cc9 --- /dev/null +++ b/extra/zsh/svn-1.7.patch @@ -0,0 +1,34 @@ +diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn +index b1cb730..41cc3e7 100644 +--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn ++++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn +@@ -6,12 +6,28 @@ + + setopt localoptions noksharrays extendedglob NO_shwordsplit + local svnbase svnbranch a b rrn ++local -i rc + local -A svninfo parentinfo + local -xA hook_com + + svnbase="."; + svninfo=() +-${vcs_comm[cmd]} info --non-interactive | while IFS=: read a b; do svninfo[${a// /_}]="${b## #}"; done ++# Unfortunately, `$pipestatus' is broken currently. Until that problem is ++# resolved, here is a workaround that will get things done, without using it. ++# Clumsily, but that's life. ++local -a dat ++dat=( ${(f)"$(${vcs_comm[cmd]} info --non-interactive 2>&1)"} ) ++rc=$? ++(( rc != 0 )) && return 1 ++# The following line is the real code, the following is the workaround. ++#${vcs_comm[cmd]} info --non-interactive \ ++print -l "${dat[@]}" \ ++|& while IFS=: read a b; do ++ svninfo[${a// /_}]="${b## #}" ++done ++#rc=${pipestatus[1]} ++#(( rc != 0 )) && return 1 ++ + while [[ -d "${svnbase}/../.svn" ]]; do + parentinfo=() + ${vcs_comm[cmd]} info --non-interactive "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done |