[prev in list] [next in list] [prev in thread] [next in thread] 

List:       spacewalk-commits
Subject:    client/rhel
From:       adelton () fedoraproject ! org (Jan Pazdziora)
Date:       2010-08-31 11:55:19
Message-ID: 20100831115519.6DBEA1201BD () lists ! fedorahosted ! org
[Download RAW message or body]

 client/rhel/rhn-client-tools/src/actions/errata.py |    4 ++++
 1 file changed, 4 insertions(+)

New commits:
commit 4da050d299f45cfdaaad643eff8be750eb9a8555
Author: Jan Pazdziora <jpazdziora at redhat.com>
Date:   Tue Aug 31 13:55:09 2010 +0200

    603028 - when checking package architecture during errata update, allow \
transition to and from noarch.

diff --git a/client/rhel/rhn-client-tools/src/actions/errata.py \
b/client/rhel/rhn-client-tools/src/actions/errata.py index 6d928bf..74236e8 100644
--- a/client/rhel/rhn-client-tools/src/actions/errata.py
+++ b/client/rhel/rhn-client-tools/src/actions/errata.py
@@ -49,6 +49,10 @@ def update(errataidlist, cache_only=None):
         for p in packagelist:
 	    if current_packages_with_arch.has_key(p[0]+p[4]):
 	        u[p[0]+p[4]] = p
+	    elif current_packages_with_arch.has_key(p[0]+"noarch"):
+	        u[p[0]+p[4]] = p
+	    elif p[4] == "noarch" and current_packages.has_key(p[0]):
+	        u[p[0]] = p
     else:
         # 5.2 and older sats + hosted dont send arch
         for p in packagelist:


[prev in list] [next in list] [prev in thread] [next in thread]