[yum-git] Branch 'yum-3_2_X' - 2 commits - yum/comps.py yum/__init__.py yum.spec

[Seth Vidal]

 yum.spec        |    5 ++++-
 yum/__init__.py |    3 +--
 yum/comps.py    |   10 +++++++---
 3 files changed, 12 insertions(+), 6 deletions(-)

New commits:
commit 711891c4085301d218f7710dd3ed7003fef6b88f
Merge: 01992cc... cdff3b1...
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Aug 26 15:40:17 2008 -0400

    Merge branch 'yum-3_2_X' of ssh://login.linux.duke.edu/home/groups/yum/git/yum into yum-3_2_X
    
    * 'yum-3_2_X' of ssh://login.linux.duke.edu/home/groups/yum/git/yum:
      Set the close on exec flag. for the transaction-done file, bug 460098

commit 01992cc7ea3e04e4c7eb192a97a373bc2322a9e1
Author: Seth Vidal <skvidal at fedoraproject.org>
Date:   Tue Aug 26 15:40:07 2008 -0400

    - make group* commands default to case insensitive like they used to
    - mark as 3.2.19

diff --git a/yum.spec b/yum.spec
index 0e2e7bc..9435e0d 100644
--- a/yum.spec
+++ b/yum.spec
@@ -1,6 +1,6 @@
 Summary: RPM installer/updater
 Name: yum
-Version: 3.2.18
+Version: 3.2.19
 Release: 0
 License: GPL
 Group: System Environment/Base
@@ -99,6 +99,9 @@ exit 0
 %{_mandir}/man*/yum-updatesd*
 
 %changelog
+* Mon Aug 25 2008 Seth Vidal <skvidal at fedoraproject.org>
+- 3.2.19
+
 * Thu Aug  7 2008 Seth Vidal <skvidal at fedoraproject.org>
 - 3.2.18
 
diff --git a/yum/__init__.py b/yum/__init__.py
index 7ea3aa6..4fa47eb 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -73,7 +73,7 @@ import string
 
 from urlgrabber.grabber import default_grabber
 
-__version__ = '3.2.18'
+__version__ = '3.2.19'
 __version_info__ = tuple([ int(num) for num in __version__.split('.')])
 
 #  Setup a default_grabber UA here that says we are yum, done using the global
@@ -2960,7 +2960,6 @@ class YumBase(depsolve.Depsolve):
         """
         keyurls = repo.gpgkey
         key_installed = False
-
         for keyurl in keyurls:
             keys = self._retrievePublicKey(keyurl)
             for info in keys:
diff --git a/yum/comps.py b/yum/comps.py
index 5d257cf..0697ebc 100755
--- a/yum/comps.py
+++ b/yum/comps.py
@@ -402,7 +402,7 @@ class Comps(object):
 
         return None
 
-    def return_groups(self, group_pattern):
+    def return_groups(self, group_pattern, case_sensitive=False):
         """return all groups which match either by glob or exact match"""
         returns = {}
 
@@ -412,8 +412,12 @@ class Comps(object):
                 thisgroup = self._groups[item]
                 returns[thisgroup.groupid] = thisgroup
                 continue
-                            
-            match = re.compile(fnmatch.translate(item)).match
+            
+            if case_sensitive:
+                match = re.compile(fnmatch.translate(item)).match
+            else:
+                match = re.compile(fnmatch.translate(item), flags=re.I).match
+
             for group in self.groups:
                 names = [ group.name, group.groupid ]
                 names.extend(group.translated_name.values())