backend/server/action/packages.py | 2 ++
1 file changed, 2 insertions(+)
New commits:
commit afce44e050147bfdb8d06423c1cf06352aff5b4f
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Wed Jun 19 12:12:52 2013 +0200
852250 - filter out bad package/architecture combinations
during installing packages (e.g. during registering system with an activation
key with packages to insall with it) with bad combination of package name
and architecture this should be filtered and do not cause an error
with rhn_check -vvvvv
diff --git a/backend/server/action/packages.py b/backend/server/action/packages.py
index da66d5e..23d77a2 100644
--- a/backend/server/action/packages.py
+++ b/backend/server/action/packages.py
@@ -213,6 +213,7 @@ left join rhnPackageArch pa
and ap.evr_id = p.evr_id
and ap.evr_id = pe.id
and ap.name_id = p.name_id
+ and (ap.package_arch_id = p.package_arch_id or ap.package_arch_id is null)
and ap.name_id = pn.id
and p.id = cp.package_id
and cp.channel_id = sc.channel_id
@@ -235,6 +236,7 @@ left join rhnPackageArch pa
and ap.evr_id is null
and ap.name_id = p.name_id
and p.name_id = pn.id
+ and (ap.package_arch_id = p.package_arch_id or ap.package_arch_id is null)
and p.id = cp.package_id
and cp.channel_id = sc.channel_id
and sc.server_id = :serverid"""
Show replies by date