[yum-commits] Branch 'yum-3_2_X' - 3 commits - cli.py

[James Antill]

 cli.py |    6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 617c6b3b6b2b3ccf62ac11b0ea1610d462c4e928
Merge: cb1d870... c2a6260...
Author: James Antill <james at and.org>
Date:   Fri Apr 8 14:07:44 2011 -0400

    Merge branch 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://yum.baseurl.org/srv/projects/yum/git/yum:
      Avoid unneeded file/dir/ghost list lookups and list concat when dumping deps as XML.
      Avoid unneeded returnFileEntries() and list concat for provides_for file deps.
      Fix _dump_requires() docstring.
      Revert "Allow plugins to signal exit status, bump plugin API version to 2.7."
      Allow plugins to signal exit status, bump plugin API version to 2.7.
      Fix bugs in the skip-broken code, this should fix some of the weird cases where skip-broken fails today

commit cb1d870f6057d9ba7b5dd832afc86872f96d17ff
Author: James Antill <james at and.org>
Date:   Thu Apr 7 15:08:18 2011 -0400

     Make -- work with firstParse, without breaking other options. BZ 694394.

diff --git a/cli.py b/cli.py
index b0a6292..aefb841 100644
--- a/cli.py
+++ b/cli.py
@@ -1434,8 +1434,7 @@ class YumOptionParser(OptionParser):
                          '-e', '--errorlevel',
                          '--installroot',
                          '--disableplugin', '--enableplugin', '--releasever',
-                         '--setopt',
-                         '--'),
+                         '--setopt'),
                         args)
         except ValueError, arg:
             self.base.usage()
@@ -1699,6 +1698,7 @@ def _filtercmdline(novalopts, valopts, args):
 
     Will raise ValueError if there was a problem parsing the command line.
     '''
+    # ' xemacs syntax hack
     out = []
     args = list(args)       # Make a copy because this func is destructive
 
@@ -1709,6 +1709,9 @@ def _filtercmdline(novalopts, valopts, args):
             if opt in valopts:
                 out.append(a)
 
+        elif a == '--':
+            out.append(a)
+
         elif a in novalopts:
             out.append(a)
 
commit c8fe26559b13161c4407562e370aad14e9816e9a
Author: James Antill <james at and.org>
Date:   Fri Apr 1 13:46:34 2011 -0400

    Make -- work with firstParse. Eg. "install -- emacs -emacs"

diff --git a/cli.py b/cli.py
index dd6f5c7..b0a6292 100644
--- a/cli.py
+++ b/cli.py
@@ -1434,7 +1434,8 @@ class YumOptionParser(OptionParser):
                          '-e', '--errorlevel',
                          '--installroot',
                          '--disableplugin', '--enableplugin', '--releasever',
-                         '--setopt'), 
+                         '--setopt',
+                         '--'),
                         args)
         except ValueError, arg:
             self.base.usage()