[yum-commits] 3 commits - docs/yum.conf.5 yum/comps.py yum/igroups.py yum/__init__.py

[James Antill]

 docs/yum.conf.5 |   14 ++++++++++++++
 yum/__init__.py |   12 ++++++++++--
 yum/comps.py    |    6 ++++++
 yum/igroups.py  |    6 ++++++
 4 files changed, 36 insertions(+), 2 deletions(-)

New commits:
commit c6101a9440ed7c9ab463df8b1897bdfa0fe640f7
Author: James Antill <james at and.org>
Date:   Mon Jun 3 11:21:05 2013 -0400

    Workaround anaconda passing us None as a group name. BZ 959710.

diff --git a/yum/comps.py b/yum/comps.py
index aa13b9a..af79a55 100755
--- a/yum/comps.py
+++ b/yum/comps.py
@@ -638,6 +638,9 @@ class Comps(object):
         """return all groups which match either by glob or exact match"""
         returns = {}
 
+        if not group_pattern:
+            return []
+
         for item in group_pattern.split(','):
             item = item.strip()
             if item in self._groups:
@@ -689,6 +692,9 @@ class Comps(object):
         """return all environments which match either by glob or exact match"""
         returns = {}
 
+        if not env_pattern:
+            return []
+
         for item in env_pattern.split(','):
             item = item.strip()
             if item in self._environments:
diff --git a/yum/igroups.py b/yum/igroups.py
index 17f1b56..cbb070f 100644
--- a/yum/igroups.py
+++ b/yum/igroups.py
@@ -216,6 +216,9 @@ class InstalledGroups(object):
     def return_groups(self, group_pattern, case_sensitive=False):
         returns = {}
 
+        if not group_pattern:
+            return []
+
         for item in group_pattern.split(','):
             item = item.strip()
             if item in self.groups:
@@ -257,6 +260,9 @@ class InstalledGroups(object):
     def return_environments(self, evgroup_pattern, case_sensitive=False):
         returns = {}
 
+        if not evgroup_pattern:
+            return []
+
         for item in evgroup_pattern.split(','):
             item = item.strip()
             if item in self.environments:
commit 95a971e30f2742a3047c2ed7843efa562373818a
Author: James Antill <james at and.org>
Date:   Mon Jun 3 11:16:42 2013 -0400

    Fix problems with treating igrp/ievgrp as comps. versions. BZ 955236.

diff --git a/yum/__init__.py b/yum/__init__.py
index 8afde56..a4b14c0 100644
--- a/yum/__init__.py
+++ b/yum/__init__.py
@@ -3353,7 +3353,11 @@ much more problems).
         if group.groupid in self.igroups.groups:
             pkg_names = self.igroups.groups[group.groupid].pkg_names
 
-        for pkg_name in set(group.packages + list(pkg_names)):
+        all_pkg_names = set(list(pkg_names))
+        if hasattr(group, 'packages'): # If a comps. group, add remote pkgs.
+            all_pkg_names.update(group.packages)
+
+        for pkg_name in all_pkg_names:
             ipkgs = self.rpmdb.searchNames([pkg_name])
             if pkg_name not in pkg_names and not ipkgs:
                 ret[pkg_name] = 'available'
@@ -3388,7 +3392,11 @@ much more problems).
             grp_names = self.igroups.environments[evgroup.environmentid]
             grp_names = grp_names.grp_names
 
-        for grp_name in set(evgroup.allgroups + list(grp_names)):
+        all_grp_names = set(list(grp_names))
+        if hasattr(evgroup, 'allgroups'): # If a comps. evgroup, add remote grps
+            all_grp_names.update(evgroup.allgroups)
+
+        for grp_name in all_grp_names:
             igrp = self.igroups.groups.get(grp_name)
             if grp_name not in grp_names and not igrp:
                 ret[grp_name] = 'available'
commit 665cfc60f00512cc56613ed8764c3e3362ade9f4
Author: James Antill <james at and.org>
Date:   Mon Jun 3 10:39:53 2013 -0400

    Add documentation for color_list_installed/available_running_kernel.

diff --git a/docs/yum.conf.5 b/docs/yum.conf.5
index dab3155..eccfa38 100644
--- a/docs/yum.conf.5
+++ b/docs/yum.conf.5
@@ -674,6 +674,13 @@ Default is `normal'.
 See color_list_installed_older for possible values.
 
 .IP
+\fBcolor_list_installed_running_kernel \fR
+The colorization/highlighting for kernel packages in list/info installed which
+is the same version as the running kernel.
+Default is `bold,underline.
+See color_list_installed_older for possible values.
+
+.IP
 \fBcolor_list_installed_extra \fR
 The colorization/highlighting for packages in list/info installed which has
 no available package with the same name and arch.
@@ -709,6 +716,13 @@ Default is `bold,underline,green.
 See color_list_installed_older for possible values.
 
 .IP
+\fBcolor_list_available_running_kernel \fR
+The colorization/highlighting for kernel packages in list/info available which
+is the same version as the running kernel.
+Default is `bold,underline.
+See color_list_installed_older for possible values.
+
+.IP
 \fBcolor_search_match \fR
 The colorization/highlighting for text matches in search.
 Default is `bold'.