backend/satellite_tools/reports/data/inventory | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)
New commits: commit 552f13cf0d75d8bb6dff2461825863291ff023c5 Author: Jan Pazdziora jpazdziora@redhat.com Date: Thu Jul 23 14:55:03 2009 +0200
reporting: add channel(s) to which the server is registered.
diff --git a/backend/satellite_tools/reports/data/inventory b/backend/satellite_tools/reports/data/inventory index 304a70b..e3559b5 100755 --- a/backend/satellite_tools/reports/data/inventory +++ b/backend/satellite_tools/reports/data/inventory @@ -8,7 +8,8 @@ ( select count(distinct rhnpackage.name_id) from rhnpackage, rhnserverneededpackagecache where rhnserver.id = rhnserverneededpackagecache.server_id and rhnserverneededpackagecache.package_id = rhnpackage.id ) as packages_out_of_date, - ( select count(*) from rhnServerErrataTypeView where rhnserver.id = server_id ) as errata_out_of_date + ( select count(*) from rhnServerErrataTypeView where rhnserver.id = server_id ) as errata_out_of_date, + rhnchannel.name as software_channel from rhnserver, ( select server_id, hostname, ipaddr @@ -18,7 +19,10 @@ from rhnservernetwork group by server_id ) - ) rhnservernetwork + ) rhnservernetwork, + rhnserverchannel, rhnchannel where rhnserver.id = rhnservernetwork.server_id (+) - order by server_id + and rhnserver.id = rhnserverchannel.server_id (+) + and rhnserverchannel.channel_id = rhnchannel.id (+) + order by server_id, rhnchannel.parent_channel nulls first, rhnchannel.id
spacewalk-commits@lists.fedorahosted.org