From f15627d17b8bbf8c6c3623844be509b544d8a9f6 Mon Sep 17 00:00:00 2001
From: Oliver Kiddle <opk@users.sourceforge.net>
Date: Fri, 14 Nov 2003 16:19:25 +0000
Subject: 19244: various completion function fixes and updates

---
 Completion/Mandrake/Command/_urpmi | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'Completion/Mandrake/Command')

diff --git a/Completion/Mandrake/Command/_urpmi b/Completion/Mandrake/Command/_urpmi
index d03dd311f..2376b09de 100644
--- a/Completion/Mandrake/Command/_urpmi
+++ b/Completion/Mandrake/Command/_urpmi
@@ -30,7 +30,7 @@ _urpmi_rpms() {
   _tags rpms files
 
   while _tags; do
-    if _requested rpms expl 'urpmi RPMs'; then
+    if _requested rpms expl 'urpmi RPM'; then
       local -a synthesis pkgs
       synthesis=(/var/lib/urpmi/synthesis.*(N))
       if [[ $#synthesis -gt 0 ]]; then
@@ -43,11 +43,13 @@ _urpmi_rpms() {
       fi
     fi
 
-    _requested files expl '(S)RPM files' \
+    _requested files expl '(S)RPM file' \
       _files -g '*.(#i)rpm' && ret=0
+  
+    (( ret )) || break
   done
 
-  return $ret
+  return ret
 }
 
 _urpmi_media_url() {
@@ -94,7 +96,7 @@ _urpmi() {
 	"(--distrib):name of media: " \
 	"(--distrib):media URL:_urpmi_media_url" \
 	"(--distrib): :(with)" \
-	"(--distrib):relative path to hdlist file: " \
+	"(--distrib):relative path to hdlist file" \
        && ret=0
     ;;
     urpmi.removemedia )
@@ -153,7 +155,7 @@ _urpmi() {
 	"(--help -h --src -s)"{--src,-s}"[next package is source package]" \
 	"(--help -h)--update[use only update media]" \
 	"(--help -h -c -p -P)-c[choose complete method for resolving requires closure]" \
-	"(--help -h)-d[show package depndencies]" \
+	"(--help -h)-d[show package dependencies]" \
 	"(--help -h)-f[print version, release and arch with name]" \
 	"(--help -h)-g[print groups too with name]" \
 	"(--help -h -c -p -P)-p[allow search in provides to find package]" \
@@ -161,7 +163,7 @@ _urpmi() {
 	"(--help -h)-r[print version and release too with name]" \
 	"(--help -h)-u[remove package if a better version is already installed]" \
 	"(--help -h)-v[verbose mode]" \
-	"(--help -h)*:urpmi package name: " \
+	"(--help -h)*:urpmi package name" \
      && ret=0
     ;;
   esac
-- 
cgit 1.4.1