Re: PATCH: bugfixes for _rpm and _hash

Re: PATCH: bugfixes for _rpm and _hash

[Sven Wischnowsky]

Adam Spiers wrote:

> Adam Spiers (adam@spiers.net) wrote:
> > Bart Schaefer (schaefer@candle.brasslantern.com) wrote:
> > > Take that "$expl[@]" out of there, you don't need it and it's ultimately
> > > causing an empty string as an argument to _files.
> > 
> > Ahah.  In that case is _hash wrong?  It has
> > 
> >   _wanted -C value values expl 'executable file' _files "$expl[@]" -g '*(-*)'
> > 
> > which seems to exhibit the same problem.
> 
> As soon as someone confirms this, I'll apply this patch, which makes
> things work as expected.

I don't know rpm, so I can only talk about the other stuff.

It is ok, but you don't need to use _wanted for _files if you don't
need to change the context (i.e. if you don't need to give the -C
option to _wanted as _hash does). _files is one of the functions that
does everything you need (like the other type-of-matches functions,
e.b. _pids, _options and so on).

About the $expl[@] stuff... sorry for that, I think I should take the
time to look at all the completion functions again to see if such bugs 
are somewhere else, too. Sigh.

Bye
 Sven


--
Sven Wischnowsky                         wischnow@informatik.hu-berlin.de

PATCH: bugfixes for _rpm and _hash

[Adam Spiers]

Adam Spiers (adam@spiers.net) wrote:
> Bart Schaefer (schaefer@candle.brasslantern.com) wrote:
> > Take that "$expl[@]" out of there, you don't need it and it's ultimately
> > causing an empty string as an argument to _files.
> 
> Ahah.  In that case is _hash wrong?  It has
> 
>   _wanted -C value values expl 'executable file' _files "$expl[@]" -g '*(-*)'
> 
> which seems to exhibit the same problem.

As soon as someone confirms this, I'll apply this patch, which makes
things work as expected.

Index: Completion/Builtins/_hash
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Builtins/_hash,v
retrieving revision 1.2
diff -u -r1.2 _hash
--- Completion/Builtins/_hash	2000/04/11 07:57:56	1.2
+++ Completion/Builtins/_hash	2000/04/26 17:38:04
@@ -10,7 +10,7 @@
         compadd -q -S '=' - "${(@k)nameddirs}"
   fi
 elif compset -P 1 '*='; then
-  _wanted -C value values expl 'executable file' _files "$expl[@]" -g '*(-*)'
+  _wanted -C value values expl 'executable file' _files -g '*(-*)'
 else
   _wanted -C name commands expl command compadd -q -S '=' - "${(@k)commands}"
 fi
Index: Completion/Linux/_rpm
===================================================================
RCS file: /cvsroot/zsh/zsh/Completion/Linux/_rpm,v
retrieving revision 1.6
diff -u -r1.6 _rpm
--- Completion/Linux/_rpm	2000/04/17 08:42:18	1.6
+++ Completion/Linux/_rpm	2000/04/26 17:38:04
@@ -70,8 +70,9 @@
   '--erase:*:uninstall:->uninstall' \
   -'b+[build mode (spec file)]:build stage:((p\:execute\ \%prep\ stage l\:do\ a\ list\ check c\:execute\ build\ stage i\:execute\ install\ stage b\:build\ a\ binary\ package a\:build\ binary\ and\ source\ packages)):*:build:->build_b' \
   -'t+[build mode (tar file)]:build stage:((p\:execute\ \%prep\ stage l\:do\ a\ list\ check c\:execute\ build\ stage i\:execute\ install\ stage b\:build\ a\ binary\ package a\:build\ binary\ and\ source\ packages)):*:build:->build_t' \
-  --{rmsource,recompile,resign,addsign}':*:RPM package:->package' \
-  '--rebuild:*:Src RPM files:->package_src' \
+  --{resign,addsign}':*:RPM package:->package' \
+  '--rmsource:*:spec file:->spec_file' \
+  --{rebuild,recompile}':*:Src RPM files:->package_src' \
     '-K+[signature check mode]:*:sigcheck:->sigcheck' \
   '--checksig:*:sigcheck:->sigcheck' \
   '--rebuilddb:*:rebuild:->rebuild' && ret=0
@@ -198,13 +199,17 @@
     _wanted packages expl 'RPM package' \
         compadd -M 'r:|-=* r:|=*' - $(_call packages rpm -qa) && ret=0
     ;;
+  spec_file)
+    _wanted specfiles expl 'spec file' \
+        _files -g \*.spec && ret=0
+    ;;
   package_file)
     if compset -P ftp://; then
       _hosts -S/ && ret=0
     else
       _alternative \
           'files:RPM package file:_files -g \*.\(\#i\)rpm' \
-	  'prefixes:ftp URL prefix:compadd ftp://' && ret=0
+          'prefixes:ftp URL prefix:compadd ftp://' && ret=0
     fi
     ;;
   package_src)