[patch] _pkgname() checks 'md5-cache' and 'cache folders' under $portdir/metadata/

0001-gentoo-_pkgname-needs-to-check-both-md5-cache-and-ca.patch (text/plain), 2.71 KB, created by Jacek Sowiński on 2012-08-15 22:37:31 UTC

From 72a00464f9b52f646203f5417036c9956f48fbd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jacek=20Sowi=C5=84ski?= <[e-mail]>
Date: Wed, 15 Aug 2012 19:17:32 +0200
Subject: [PATCH 1/4] gentoo: _pkgname needs to check both 'md5-cache' and 'cache' folders

Searching for cache files in only one of this locations results in premature
end of completion and buggy results.

--HG--
extra : rebase_source : b58c02d308c0bcdfe51ff441d780a7315d58ae80
---
 gentoo |   28 +++++++++++++++++-----------
 1 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/gentoo b/gentoo
index 261e555..8023329 100644
--- a/gentoo
+++ b/gentoo
@@ -108,10 +108,13 @@ _pkgname()
             # The portage cache is appropriate to complete specific versions from.
             COMPREPLY=(${COMPREPLY[@]} $(\
                         for pd in ${portdir} ; do \
-                            if [[ -d ${pd}/metadata/cache ]] ; then \
-                                builtin cd ${pd}/metadata/cache; \
-                                compgen -W "$(compgen -G "${cur}*")" -- "${cur}" ; \
-                            fi ; \
+                            if [[ -d ${pd}/metadata/md5-cache ]]; then
+                                builtin cd ${pd}/metadata/md5-cache;
+                                compgen -W "$(compgen -G "${cur}*")" -- "${cur}";
+                            elif [[ -d ${pd}/metadata/cache ]]; then
+                                builtin cd ${pd}/metadata/cache;
+                                compgen -W "$(compgen -G "${cur}*")" -- "${cur}";
+                            fi;
                         done))
             fi
         else
@@ -128,13 +131,16 @@ _pkgname()
             local words=$(echo -e ${w} | sort -u)
 
             COMPREPLY=($(compgen -W "$words" -- $cur))
-                if [[ ${#COMPREPLY[@]} == 1 ]]; then
-            COMPREPLY=($(compgen -W "$(\
-                    for pd in ${portdir} ; do \
-                        if [[ -d ${pd}/metadata/cache ]] ; then
-                            builtin cd ${pd}/metadata/cache; \
-                            compgen -G "$COMPREPLY*" ; \
-                        fi ; \
+            if [[ ${#COMPREPLY[@]} == 1 ]]; then
+                COMPREPLY=($(compgen -W "$(\
+                    for pd in ${portdir} ; do
+                        if [[ -d ${pd}/metadata/md5-cache ]]; then
+                            builtin cd ${pd}/metadata/md5-cache;
+                            compgen -G "$COMPREPLY*";
+                        elif [[ -d ${pd}/metadata/cache ]]; then
+                            builtin cd ${pd}/metadata/cache;
+                            compgen -G "$COMPREPLY*";
+                        fi
                     done)" -- $cur))
             fi
         fi
-- 
1.7.3.4