[yum-commits] 3 commits - completion-helper.py etc/yum.bash yum/__init__.py

[zpavlas at osuosl.org]

 completion-helper.py |    3 ++-
 etc/yum.bash         |    4 ++--
 yum/__init__.py      |    4 ++++
 3 files changed, 8 insertions(+), 3 deletions(-)

New commits:
commit dd286e73dabdb07cdb702892f4b38d0dc7f233cc
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Wed May 9 13:22:55 2012 +0200

    Fix the 'yum provides ""' case.  BZ 817491.

diff --git a/yum/__init__.py b/yum/__init__.py
index 2be21a0..8eea31e 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3051,10 +3051,14 @@ class YumBase(depsolve.Depsolve):
         def _arg_data(arg):
             if not misc.re_glob(arg):
                 isglob = False
+<<<<<<< HEAD
                 if not arg or arg[0] != '/':
                     canBeFile = False
                 else:
                     canBeFile = True
+=======
+                canBeFile = arg.startswith('/')
+>>>>>>> Fix the 'yum provides ""' case.  BZ 817491.
             else:
                 isglob = True
                 canBeFile = misc.re_filename(arg)
commit a18c08afe7959db38e16d2422f1b1f97f54fcc22
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Wed May 9 12:50:52 2012 +0200

    Catch shlex.split() exceptions. BZ 819751.

diff --git a/completion-helper.py b/completion-helper.py
index 405ceab..0e4b96b 100755
--- a/completion-helper.py
+++ b/completion-helper.py
@@ -64,7 +64,8 @@ class RepoListCompletionCommand(yumcommands.RepoListCommand):
 
 def get_pattern(extcmds):
     if len(extcmds) > 1 and extcmds[-1]:
-        return shlex.split(extcmds[-1])[0] + "*"
+        try: return shlex.split(extcmds[-1])[0] + "*"
+        except ValueError: pass
     return "*"
 
 def main(args):
commit 36868c0f79fcce18d50ef8c3a599eaac976b3965
Author: Zdeněk Pavlas <zpavlas at redhat.com>
Date:   Wed May 9 09:57:32 2012 +0200

    yum.bash: Don't search for packages like '-*'. BZ 819229.

diff --git a/etc/yum.bash b/etc/yum.bash
index 16b011a..b21c594 100644
--- a/etc/yum.bash
+++ b/etc/yum.bash
@@ -9,8 +9,8 @@ _yum_helper()
 
 _yum_list()
 {
-    # Fail fast for things that look like paths.
-    [[ $2 == */* || $2 == [.~]* ]] && return
+    # Fail fast for things that look like paths or options.
+    [[ $2 == */* || $2 == [.~-]* ]] && return
     _yum_helper list "$@"
 }