java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml | 21
++--------
java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java | 11 ++++-
java/spacewalk-java.spec | 17 +++++++-
rel-eng/packages/spacewalk-java | 2
4 files changed, 31 insertions(+), 20 deletions(-)
New commits:
commit 0518c4332d1ad1cc1853e0ad25c56f8c16bb7c3f
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Nov 20 10:14:02 2009 +0100
Automatic commit of package [spacewalk-java] release [0.7.18-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 4797ea9..695a41c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -12,7 +12,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.7.17
+Version: 0.7.18
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -280,6 +280,21 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Nov 20 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.18-1
+- some columns not filled on webui for non-cve errata (tlestach(a)redhat.com)
+- checkstyle fix (jsherril(a)redhat.com)
+- 512844 - fixing inefficient query in package set clenaup
+ (jsherril(a)redhat.com)
+- unit test fix - we no longer do validation checking on kickstart partitions,
+ so no need to test it (jsherril(a)redhat.com)
+- unit test fix - kickstart compare packages was not working correctly
+ (jsherril(a)redhat.com)
+- 537491 - fixing issue with cloned kickstart profiles losing the package list
+ during cloning (jsherril(a)redhat.com)
+- checkstyle fix (jsherril(a)redhat.com)
+- unit test fix (jsherril(a)redhat.com)
+- unit test fix (jsherril(a)redhat.com)
+
* Thu Nov 12 2009 Tomas Lestach <tlestach(a)redhat.com> 0.7.17-1
- 536825 - storing "@ Base" KickstartPackage into DB (tlestach(a)redhat.com)
- java code enhancements according to jsherrill's comments
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 325e013..f1305e7 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-0.7.17-1 java/
+0.7.18-1 java/
commit 3a37c0f219adef0b34c75a008e94d915fecc9471
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Nov 19 15:14:56 2009 +0100
some columns not filled on webui for non-cve errata
errata_cves_elab didn't fill other columns, if no associated cves found
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
index 7ab88c0..c17e8aa 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Errata_queries.xml
@@ -66,6 +66,7 @@ SELECT E.id, E.update_date
ORDER BY E.update_date DESC, E.id
</query>
<elaborator name="errata_cves_elab" />
+ <elaborator name="errata_overview" />
</mode>
<mode name="all_errata"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
@@ -103,7 +104,7 @@ SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
<mode name="all_errata_by_type_with_cves"
class="com.redhat.rhn.frontend.dto.SecurityErrataOverview">
<query params="org_id, type">
-SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
+SELECT DISTINCT E.id, E.update_date
FROM rhnErrata E, rhnChannelErrata CE, rhnChannel C,
rhnChannelFamilyMembers CFM,
rhnOrgChannelFamilyPermissions OCF
@@ -116,6 +117,7 @@ SELECT DISTINCT E.id, E.update_date, E.synopsis AS ADVISORY_SYNOPSIS
ORDER BY E.update_date DESC, E.id
</query>
<elaborator name="errata_cves_elab" />
+ <elaborator name="errata_overview" />
</mode>
<mode name="all_errata_orig"
class="com.redhat.rhn.frontend.dto.ErrataOverview">
@@ -1286,21 +1288,8 @@ SELECT E.id, E.advisory, E.synopsis
</query>
</mode>
-<query name="errata_cves_elab" params="user_id" >
-SELECT E.id, E.advisory_name, E.advisory_type, E.synopsis AS ADVISORY_SYNOPSIS,
- C.name AS CVE,
- (SELECT COUNT(DISTINCT S.id)
- FROM rhnServerNeededErrataCache SNEC,
- rhnServer S, rhnUserServerPerms USP
- WHERE USP.user_id = :user_id
- AND USP.server_id = S.ID
- AND S.id = SNEC.server_id
- AND EXISTS (SELECT 1
- FROM rhnServerFeaturesView SFV
- WHERE SFV.server_id = SNEC.server_id
- AND SFV.label = 'ftr_errata_updates')
- AND SNEC.errata_id = E.id)
- AS AFFECTED_SYSTEM_COUNT
+<query name="errata_cves_elab">
+SELECT E.id, C.name AS CVE
FROM rhnErrata E, rhnCve C, rhnErrataCVE EC
WHERE E.id IN (%s)
AND E.id = EC.errata_id
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java
b/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java
index 5f0e419..34a5eef 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/SecurityErrataOverview.java
@@ -42,9 +42,16 @@ public class SecurityErrataOverview extends ErrataOverview
*/
public void callback(ResultSet rs) throws SQLException {
if (rs != null) {
- String cve = rs.getString("CVE");
- if (cve != null) {
+ // need to use try-catch, because of use of two
+ // elaborators (only one of them elaborates "CVE")
+ try {
+ String cve = rs.getString("CVE");
+ if (cve != null) {
addCve(cve);
+ }
+ }
+ catch (SQLException e) {
+ return;
}
}
}