[yum-commits] 2 commits - yum/rpmsack.py yum/updateinfo.py

[James Antill]

 yum/rpmsack.py    |    2 +-
 yum/updateinfo.py |    6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

New commits:
commit 263a207dfed8d74c48d446e9cdb8f6fce0c46b15
Author: James Antill <james at and.org>
Date:   Tue May 14 16:37:11 2013 -0400

    Fix really old API mistake in _search(), when fully loaded and no name.

diff --git a/yum/rpmsack.py b/yum/rpmsack.py
index ff0666c..56c3793 100644
--- a/yum/rpmsack.py
+++ b/yum/rpmsack.py
@@ -1320,7 +1320,7 @@ class RPMDBPackageSack(PackageSackBase):
                 if not pkgs:
                     self._pkgname_fails.add(name)
             else:
-                pkgs = self.returnPkgs()
+                pkgs = self.returnPackages()
             for po in pkgs:
                 for tag in ('arch', 'rel', 'ver', 'epoch'):
                     if loc[tag] is not None and loc[tag] != getattr(po, tag):
commit 27743a50517dd90b6745dc6511d4dcd8f09d24e4
Author: James Antill <james at and.org>
Date:   Mon May 13 16:04:36 2013 -0400

    Allow user to drop CVE- prefix for CVEs.

diff --git a/yum/updateinfo.py b/yum/updateinfo.py
index c0a5094..1cc207f 100644
--- a/yum/updateinfo.py
+++ b/yum/updateinfo.py
@@ -37,11 +37,17 @@ def _match_sec_cmd(sec_cmds, pkgname, notice):
             return i
         if fnmatch.fnmatch(notice['update_id'], i):
             return i
+
+        cvei = i
+        if not (i.startswith("CVE-") or i.startswith("*")):
+            cvei = 'CVE-' + i
         for ref in _ysp_safe_refs(notice['references']):
             if ref['id'] is None:
                 continue
             if fnmatch.fnmatch(ref['id'], i):
                 return i
+            if fnmatch.fnmatch(ref['id'], cvei):
+                return i
     return None
 
 def _has_id(used_map, refs, ref_type, ref_ids):