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

[James Antill]

 yum.spec          |    2 +-
 yum/sqlitesack.py |    2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

New commits:
commit b01511ebb31624c52570245c40e21c88faf3967b
Author: James Antill <james at and.org>
Date:   Wed Aug 27 10:13:29 2008 -0400

    Do arch excludes for obsolete tuples

diff --git a/yum/sqlitesack.py b/yum/sqlitesack.py
index aad9b19..3ac0602 100644
--- a/yum/sqlitesack.py
+++ b/yum/sqlitesack.py
@@ -687,6 +687,8 @@ class YumSqlitePackageSack(yumRepo.YumPackageSack):
                 # continue without processing the obsoletes
                 if self._pkgKeyExcluded(rep, ob['pkgKey']):
                     continue
+                if self._pkgArchExcluded(rep, ob['arch']):
+                    continue
                     
                 key = ( _share_data(ob['name']), _share_data(ob['arch']),
                         _share_data(ob['epoch']), _share_data(ob['version']),
commit 9fcd36533acdd12bc6b9ffb6e1b16d65a58dbb24
Author: James Antill <james at and.org>
Date:   Tue Aug 26 16:52:17 2008 -0400

    Fixup the License to be the same as Fedora

diff --git a/yum.spec b/yum.spec
index 9435e0d..b8cb2e2 100644
--- a/yum.spec
+++ b/yum.spec
@@ -2,7 +2,7 @@ Summary: RPM installer/updater
 Name: yum
 Version: 3.2.19
 Release: 0
-License: GPL
+License: GPLv2+
 Group: System Environment/Base
 Source: %{name}-%{version}.tar.gz
 URL: http://linux.duke.edu/yum/