java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml | 14
+++++-----
java/spacewalk-java.spec | 7 ++++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 15 insertions(+), 8 deletions(-)
New commits:
commit f4de6a79e3dd7bed825056117863545c9c3a3442
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Dec 10 14:42:25 2012 +0100
Automatic commit of package [spacewalk-java] release [1.8.181-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 899dbd5..0637d36 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.180
+Version: 1.8.181
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -617,6 +617,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Dec 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.181-1
+- 839960 - fix system.listLatestUpgradablePackages API to list upgradable
+ packages from server channels only
+- Use braces for accessing composite types in PG
+
* Mon Nov 05 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.180-1
- replace remaining DTD paths to
www.hibernate.org/dtd with 3.2 default
hibernate.sourceforge.net
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 4f5334f..43ec6ca 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.180-1 java/
+1.8.181-1 java/
commit 78fc0687052d1b53cfb5e8868e161dd777ddc12d
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Wed Oct 31 15:05:27 2012 +0100
839960 - fix system.listLatestUpgradablePackages API to list upgradable packages from
server channels only
(cherry picked from commit 1168f61a9d16b42b533a21513c8538529862e745)
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 d3a48c0..a71dfcf 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
@@ -867,6 +867,8 @@ ORDER BY UPPER(PN.name)
GROUP BY p.name_id) u
JOIN rhnPackageEvr e ON e.evr = u.max_evr
JOIN rhnPackage p ON p.name_id = u.name_id AND p.evr_id = e.id
+ JOIN rhnChannelPackage cp ON cp.package_id = p.id
+ JOIN rhnServerChannel sc ON sc.channel_id = cp.channel_id AND sc.server_id = :sid
JOIN rhnPackageArch a ON a.id = p.package_arch_id
) up,
rhnPackageUpgradeArchCompat puac
commit da43a32d242e23aceca1f37fdf3ac0ebbfe18e7b
Author: Johannes Renner <jrenner(a)suse.de>
Date: Wed Oct 31 12:18:02 2012 +0100
Use braces for accessing composite types in PG
(cherry picked from commit 594781171402e28f85cdcb9fe7e838e35288a505)
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 5b48954..d3a48c0 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
@@ -838,14 +838,14 @@ ORDER BY UPPER(PN.name)
<mode name="system_upgradable_package_list_no_errata_info">
<query params="sid">
SELECT n.name,
- NVL(sp.evr.epoch, ' ') as from_epoch,
- NVL(sp.evr.version, ' ') as from_version,
- NVL(sp.evr.release, ' ') as from_release,
+ NVL((sp.evr).epoch, ' ') as from_epoch,
+ NVL((sp.evr).version, ' ') as from_version,
+ NVL((sp.evr).release, ' ') as from_release,
spa.label as from_arch,
spa.label as arch,
- NVL(up.evr.epoch, ' ') as to_epoch,
- NVL(up.evr.version, ' ') as to_version,
- NVL(up.evr.release, ' ') as to_release,
+ NVL((up.evr).epoch, ' ') as to_epoch,
+ NVL((up.evr).version, ' ') as to_version,
+ NVL((up.evr).release, ' ') as to_release,
up.arch_label as to_arch,
up.id as to_package_id
FROM