Changes to 'refs/tags/spacewalk-java-1.2.54-1'
by Tomas Lestach
Tag 'spacewalk-java-1.2.54-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-10-07 09:48 +0000
Tagging package [spacewalk-java] version [1.2.54-1] in directory [java/].
Changes since spacewalk-schema-1.2.26-1:
Tomas Lestach (2):
640520 - removing default/rhn_taskomatic.conf file
Automatic commit of package [spacewalk-java] release [1.2.54-1].
---
java/buildconf/build-webapp.xml | 3 ---
java/conf/default/rhn_taskomatic.conf | 9 ---------
java/spacewalk-java.spec | 7 ++++---
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 5 insertions(+), 16 deletions(-)
---
13 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c2975ec529f9070081ecd2cb75950bb0271792d4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu Oct 7 11:48:41 2010 +0200
Automatic commit of package [spacewalk-java] release [1.2.54-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 644cf2a..be1117c 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.53
+Version: 1.2.54
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -338,6 +338,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Oct 07 2010 Tomas Lestach <tlestach(a)redhat.com> 1.2.54-1
+- 640520 - removing default/rhn_taskomatic.conf file (tlestach(a)redhat.com)
+
* Thu Oct 07 2010 Lukas Zapletal 1.2.53-1
- 640926 - commons-logging library is now explicitly configured in Jasper2
- PostgreSQL does not have NVL2 function and we have to use CASE WHERE.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 639403a..9822cfa 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.53-1 java/
+1.2.54-1 java/
13 years, 7 months
java/buildconf java/conf java/spacewalk-java.spec
by Tomas Lestach
java/buildconf/build-webapp.xml | 3 ---
java/conf/default/rhn_taskomatic.conf | 9 ---------
java/spacewalk-java.spec | 2 --
3 files changed, 14 deletions(-)
New commits:
commit 2528c9a26776e648a303492570b273caacf26af4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Oct 6 19:09:06 2010 +0200
640520 - removing default/rhn_taskomatic.conf file
not needed any more
diff --git a/java/buildconf/build-webapp.xml b/java/buildconf/build-webapp.xml
index 3e0117c..6fa3d4c 100644
--- a/java/buildconf/build-webapp.xml
+++ b/java/buildconf/build-webapp.xml
@@ -139,8 +139,6 @@
<echo message="NOTE: This task should be run as root since it modifies /etc and /usr/bin" />
<symlink link="/etc/rhn/default/rhn_taskomatic_daemon.conf"
resource="${rhn-home}/conf/default/rhn_taskomatic_daemon.conf" />
- <symlink link="/etc/rhn/default/rhn_taskomatic.conf"
- resource="${rhn-home}/conf/default/rhn_taskomatic.conf" />
<symlink link="/etc/rhn/default/rhn_org_quartz.conf"
resource="${rhn-home}/conf/default/rhn_org_quartz.conf" />
<symlink link="/etc/init.d/taskomatic"
@@ -156,7 +154,6 @@
<echo message="NOTE: This task should be run as root since it modifies /etc and /usr/bin" />
<echo message="This target should be run as root since it modifies /etc and /usr/bin" />
<delete file="/etc/rhn/default/rhn_taskomatic_daemon.conf" />
- <delete file="/etc/rhn/default/rhn_taskomatic.conf" />
<delete file="/etc/rhn/default/rhn_org_quartz.conf" />
<delete file="/etc/init.d/taskomatic" />
<delete file="/usr/bin/taskomaticd" />
diff --git a/java/conf/default/rhn_taskomatic.conf b/java/conf/default/rhn_taskomatic.conf
deleted file mode 100644
index bf72b8c..0000000
--- a/java/conf/default/rhn_taskomatic.conf
+++ /dev/null
@@ -1,9 +0,0 @@
-###############################################################################
-# Taskomatic configuration file
-###############################################################################
-
-# configures the number of records processed at any given run.
-# A large number could mean a really long execution time
-# causing task to misfire. The value is capped at 1000.
-# Default value is 100.
-taskomatic.errata_cache_batch_size = 100
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 6b13146..644cf2a 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -249,7 +249,6 @@ install -d -m 755 $RPM_BUILD_ROOT/%{_var}/spacewalk/systemlogs
install -d -m 755 $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d
install -m 644 conf/default/rhn_hibernate.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/default/rhn_hibernate.conf
install -m 644 conf/default/rhn_taskomatic_daemon.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/default/rhn_taskomatic_daemon.conf
-install -m 644 conf/default/rhn_taskomatic.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/default/rhn_taskomatic.conf
install -m 644 conf/default/rhn_org_quartz.conf $RPM_BUILD_ROOT/%{_sysconfdir}/rhn/default/rhn_org_quartz.conf
install -m 755 conf/logrotate/rhn_web_api $RPM_BUILD_ROOT/%{_sysconfdir}/logrotate.d/rhn_web_api
install -m 755 scripts/taskomatic $RPM_BUILD_ROOT/%{_initrddir}
@@ -321,7 +320,6 @@ fi
%defattr(644, root, root)
%config %{_sysconfdir}/rhn/default/rhn_hibernate.conf
%config %{_sysconfdir}/rhn/default/rhn_taskomatic_daemon.conf
-%config %{_sysconfdir}/rhn/default/rhn_taskomatic.conf
%config %{_sysconfdir}/rhn/default/rhn_org_quartz.conf
%config %{_sysconfdir}/logrotate.d/rhn_web_api
13 years, 7 months
Changes to 'refs/tags/spacewalk-schema-1.2.26-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.2.26-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-07 09:10 +0000
Tagging package [spacewalk-schema] version [1.2.26-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.2.53-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-schema] release [1.2.26-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
---
13 years, 7 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 10 +++++++++-
2 files changed, 10 insertions(+), 2 deletions(-)
New commits:
commit f6427d2f59962e12015e2a9c0a53d860ef0f90b2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Oct 7 11:10:15 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.2.26-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 1dfcee5..64c4cac 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.2.25-1 schema/spacewalk/
+1.2.26-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 5c1ac13..724e556 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -2,7 +2,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.2.25
+Version: 1.2.26
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,14 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Thu Oct 07 2010 Jan Pazdziora 1.2.26-1
+- nvl removal for Oracle is not necessary, reverting (lzap+git(a)redhat.com)
+- upgrade script for 2a3a755ed052a0c3435a00d1e6c1c6c9c3ecc470
+ (michael.mraka(a)redhat.com)
+- Avoid the integer arithmetics with timestamps in PostgreSQL.
+- Upgrade to Satellite 5.1 from older versions put newline to proxy.deactivate
+ record; we shall fix it now.
+
* Tue Oct 05 2010 Jan Pazdziora 1.2.25-1
- Fixed PostgreSQL trigger rhn_channel_access_trig_fun.
- Avoid using rhn_repo_regen_queue_id_seq.nextval Oracle syntax in
13 years, 7 months
Changes to 'refs/tags/spacewalk-java-1.2.53-1'
by Lukas Zapletal
Tag 'spacewalk-java-1.2.53-1' created by Lukas Zapletal <lzap+git(a)redhat.com> at 2010-10-07 09:02 +0000
Tagging package [spacewalk-java] version [1.2.53-1] in directory [java/].
Changes since spacecmd-0.7.4-1:
Justin Sherrill (1):
fixing stray comma
Lukas Zapletal (4):
PostgreSQL does not have NVL2 function and we have to use CASE WHERE.
nvl removal for Oracle is not necessary, reverting
640926 - commons-logging library is now explicitly configured in Jasper2
Automatic commit of package [spacewalk-java] release [1.2.53-1].
Michael Mraka (1):
upgrade script for 2a3a755ed052a0c3435a00d1e6c1c6c9c3ecc470
---
backend/satellite_tools/sync_handlers.py | 2
java/buildconf/build-taskdefs.xml | 10
java/code/internal/src/com/redhat/rhn/internal/jasper2/commons-logging.properties | 4
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 3
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 6
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 9
java/spacewalk-java.spec | 6
rel-eng/packages/spacewalk-java | 2
schema/spacewalk/oracle/procs/lookup_config_info.sql | 14
schema/spacewalk/upgrade/spacewalk-schema-1.1-to-spacewalk-schema-1.2/057-delete_server.sql | 260 ++++++++++
10 files changed, 294 insertions(+), 22 deletions(-)
---
13 years, 7 months
java/spacewalk-java.spec rel-eng/packages
by Lukas Zapletal
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 7a85d9f3f10149ad16105c66acea4834f2950861
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Oct 7 11:02:46 2010 +0200
Automatic commit of package [spacewalk-java] release [1.2.53-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index c865f18..6b13146 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -19,7 +19,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.52
+Version: 1.2.53
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -340,6 +340,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Oct 07 2010 Lukas Zapletal 1.2.53-1
+- 640926 - commons-logging library is now explicitly configured in Jasper2
+- PostgreSQL does not have NVL2 function and we have to use CASE WHERE.
+
* Wed Oct 06 2010 Jan Pazdziora 1.2.52-1
- Use the global function evr_t_as_vre_simple instead of method .as_vre_simple;
this works on PostgreSQL as well.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 084f18f..639403a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.52-1 java/
+1.2.53-1 java/
13 years, 7 months
java/buildconf java/code
by Lukas Zapletal
java/buildconf/build-taskdefs.xml | 10 ++++++++--
java/code/internal/src/com/redhat/rhn/internal/jasper2/commons-logging.properties | 4 ++++
2 files changed, 12 insertions(+), 2 deletions(-)
New commits:
commit d9846bfde65c9761f837d327ac975f875755dc1e
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Oct 7 10:55:50 2010 +0200
640926 - commons-logging library is now explicitly configured in Jasper2
The commons-logging framework automatically discovers which underlaying
framework to use for logging. This does not work in all cases. This fix
just explicitly configures it to use log4j which prevents this error during
jspcomiplation process:
[jasper2] java.lang.IllegalStateException: No Java compiler available
diff --git a/java/buildconf/build-taskdefs.xml b/java/buildconf/build-taskdefs.xml
index 37ce349..13f3881 100644
--- a/java/buildconf/build-taskdefs.xml
+++ b/java/buildconf/build-taskdefs.xml
@@ -22,8 +22,14 @@
<!-- =================== Jspc Tasks ======================= -->
<taskdef name="jasper2"
- classname="com.redhat.rhn.internal.jasper2.JspfC"
- classpathref="buildjars"/>
+ classname="com.redhat.rhn.internal.jasper2.JspfC">
+ <classpath>
+ <path refid="buildjars" />
+ <!-- this configures commons logging properly for Jasper2 -->
+ <pathelement
+ location="${src.dir}/internal/src/com/redhat/rhn/internal/jasper2"/>
+ </classpath>
+ </taskdef>
<!-- =================== Ant Contrib Tasks ======================= -->
<taskdef resource="net/sf/antcontrib/antcontrib.properties"
diff --git a/java/code/internal/src/com/redhat/rhn/internal/jasper2/commons-logging.properties b/java/code/internal/src/com/redhat/rhn/internal/jasper2/commons-logging.properties
new file mode 100644
index 0000000..97549c5
--- /dev/null
+++ b/java/code/internal/src/com/redhat/rhn/internal/jasper2/commons-logging.properties
@@ -0,0 +1,4 @@
+# this directory is added to classpath only during JSP precompilation step
+# to avoid ISE "No Java Compiler" error/bug in Jasper2 Compiler
+org.apache.commons.logging.Log=org.apache.commons.logging.impl.NoOpLog
+org.apache.commons.logging.LogFactory=org.apache.commons.logging.impl.LogFactoryImpl
13 years, 7 months
schema/spacewalk
by Lukas Zapletal
schema/spacewalk/oracle/procs/lookup_config_info.sql | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
New commits:
commit e57392d5c8bdf5963448f756fd006a82d708e52d
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Oct 7 09:39:03 2010 +0200
nvl removal for Oracle is not necessary, reverting
diff --git a/schema/spacewalk/oracle/procs/lookup_config_info.sql b/schema/spacewalk/oracle/procs/lookup_config_info.sql
index bfbe3b2..36fcdf4 100644
--- a/schema/spacewalk/oracle/procs/lookup_config_info.sql
+++ b/schema/spacewalk/oracle/procs/lookup_config_info.sql
@@ -1,5 +1,5 @@
--
--- Copyright (c) 2008 Red Hat, Inc.
+-- Copyright (c) 2008-2010 Red Hat, Inc.
--
-- This software is licensed to you under the GNU General Public License,
-- version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -32,13 +32,11 @@ is
select id
from rhnConfigInfo
where 1=1
- and (username = username_in or (username is null and username_in is null))
- and (groupname = groupname_in or (groupname is null and groupname_in is null))
- and (filemode = filemode_in or (filemode is null and filemode_in is null))
- and (selinux_ctx = selinux_ctx_in or
- (selinux_ctx is null and selinux_ctx_in is null))
- and (symlink_target_filename_id = symlink_target_id or
- (symlink_target_filename_id is null and symlink_target_id is null))
+ and nvl(username, ' ') = nvl(username_in, ' ')
+ and nvl(groupname,' ') = nvl(groupname_in, ' ')
+ and nvl(filemode, -1) = nvl(filemode_in, -1)
+ and nvl(selinux_ctx, ' ') = nvl(selinux_ctx_in, ' ')
+ and nvl(symlink_target_filename_id, -1) = nvl(symlink_target_id, -1)
;
begin
for r in lookup_cursor loop
13 years, 7 months
java/code
by Lukas Zapletal
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 3 ++-
java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml | 6 ++++--
java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 9 +++------
3 files changed, 9 insertions(+), 9 deletions(-)
New commits:
commit 3a97bffade6be5edbc399e775ab861a1bd29e02e
Author: Lukas Zapletal <lzap+git(a)redhat.com>
Date: Thu Oct 7 09:21:14 2010 +0200
PostgreSQL does not have NVL2 function and we have to use CASE WHERE.
There are more places where we use NVL2. Addressing all errors like
org.postgresql.util.PSQLException: ERROR:
function nvl2(integer, unknown, unknown) does not exist
org.postgresql.core.v3.QueryExecutorImpl.receiveErrorResponse(QueryExecutorImpl.java:1525)
org.postgresql.core.v3.QueryExecutorImpl.processResults(QueryExecutorImpl.java:1309)
org.postgresql.core.v3.QueryExecutorImpl.execute(QueryExecutorImpl.java:188)
org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:452)
org.postgresql.jdbc2.AbstractJdbc2Statement.executeWithFlags(AbstractJdbc2Statement.java:354)
org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:347)
com.mchange.v2.c3p0.impl.NewProxyPreparedStatement.execute(NewProxyPreparedStatement.java:651)
com.redhat.rhn.common.db.NamedPreparedStatement.execute(NamedPreparedStatement.java:139)
com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:454)
com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:431)
com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:335)
com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:340)
com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:280)
com.redhat.rhn.common.db.datasource.SelectMode.execute(SelectMode.java:105)
com.redhat.rhn.manager.BaseManager.makeDataResult(BaseManager.java:57)
com.redhat.rhn.manager.kickstart.KickstartLister.getActivationKeysInOrg(KickstartLister.java:243)
com.redhat.rhn.frontend.action.token.ActivationKeysListAction.execute(ActivationKeysListAction.java:70)
org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:431)
org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:237)
com.redhat.rhn.frontend.struts.RhnRequestProcessor.process(RhnRequestProcessor.java:82)
org.apache.struts.action.ActionServlet.process(ActionServlet.java:1196)
org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:414)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
index 61e28fe..59248c5 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml
@@ -1256,7 +1256,8 @@ END;
SELECT DISTINCT c1.id as id,
(select name from rhnChannel C2 where c1.parent_channel = c2.id) parent,
c1.name as name,
- NVL2((SELECT 1 FROM rhnRegTokenChannels WHERE token_id = :token_id AND channel_id = c1.id), 'selected', '') s
+ CASE WHEN (SELECT 1 FROM rhnRegTokenChannels WHERE token_id = 2 AND channel_id = c1.id)
+ IS NOT NULL THEN 'selected' ELSE '' END s
FROM rhnChannel c1 inner join rhnUserChannel UC on UC.channel_id = C1.id
AND c1.parent_channel IS NOT NULL
AND UC.user_id = :user_id
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
index 1c0e43a..94e6b0e 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/General_queries.xml
@@ -223,7 +223,8 @@ ORDER BY F.label
FROM rhnServerTokenRegs STR
WHERE STR.token_id = RT.id
) system_count,
- NVL2((SELECT 1 FROM rhnRegTokenOrgDefault RTOD WHERE RTOD.reg_token_id = RT.id), 'Yes', 'No') org_default
+ CASE WHEN (SELECT 1 FROM rhnRegTokenOrgDefault RTOD WHERE RTOD.reg_token_id = RT.id)
+ IS NOT NULL THEN 'Yes' ELSE 'No' END org_default
FROM rhnActivationKey AK,
rhnRegToken RT
WHERE RT.org_id = :org_id
@@ -246,7 +247,8 @@ ORDER BY RT.note, RT.id
FROM rhnServerTokenRegs STR
WHERE STR.token_id = RT.id
) system_count,
- NVL2((SELECT 1 FROM rhnRegTokenOrgDefault RTOD WHERE RTOD.reg_token_id = RT.id), 'Yes', 'No') org_default
+ CASE WHEN (SELECT 1 FROM rhnRegTokenOrgDefault RTOD WHERE RTOD.reg_token_id = RT.id)
+ IS NOT NULL THEN 'Yes' ELSE 'No' END org_default
FROM rhnActivationKey AK,
rhnRegToken RT
WHERE RT.org_id = :org_id
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
index 914e2cc..b77a9f3 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml
@@ -772,16 +772,13 @@ SELECT PN.id AS id,
AND (SP.package_arch_id IS NULL OR SP.package_arch_id =
-- If the server has more than one package of this name installed
-- Then group by arch, otherwise just use whever is there
- NVL2(
- (select 1 from rhnServerPackage sp2
+ CASE WHEN (select 1 from rhnServerPackage sp2
where
sp2.name_id = latest.name_id and
sp2.server_id = :sid
group by sp2.name_id having count(*) > 1
- ),
- latest.arch_id,
- SP.package_arch_id)
-
+ ) IS NOT NULL THEN latest.arch_id
+ ELSE SP.package_arch_id END
)
ORDER BY UPPER(PN.name)
</query>
13 years, 7 months