3 commits - java/code java/spacewalk-java.spec rel-eng/packages web/modules

Michael Mraka mmraka at fedoraproject.org
Tue Jun 26 08:11:19 UTC 2012


 java/code/src/com/redhat/rhn/common/db/datasource/xml/Package_queries.xml |    2 +-
 java/spacewalk-java.spec                                                  |    5 ++++-
 rel-eng/packages/spacewalk-java                                           |    2 +-
 web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml                  |    2 +-
 4 files changed, 7 insertions(+), 4 deletions(-)

New commits:
commit 3ae027aa6b61611536bb3afdbdffc010fa886d01
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Tue Jun 26 10:11:08 2012 +0200

    Automatic commit of package [spacewalk-java] release [1.8.96-1].

diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index d18887e..3e7d022 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.95
+Version: 1.8.96
 Release: 1%{?dist}
 URL:       https://fedorahosted.org/spacewalk
 Source0:   https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz 
@@ -615,6 +615,9 @@ fi
 %{jardir}/postgresql-jdbc.jar
 
 %changelog
+* Tue Jun 26 2012 Michael Mraka <michael.mraka at redhat.com> 1.8.96-1
+- Correcting two ISE on postgresql: NVRE not found
+
 * Mon Jun 25 2012 Jan Pazdziora 1.8.95-1
 - Fixing checkstyle.
 
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 1ce2e06..8dc6ab5 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.95-1 java/
+1.8.96-1 java/


commit e4a6c5bfbc08049536ab6db138abbd7b11c905be
Author: Michael Mraka <michael.mraka at redhat.com>
Date:   Tue Jun 26 07:42:51 2012 +0000

    Correcting two ISE on postgresql: NVRE not found

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 74c779d..59d3ce5 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
@@ -1007,7 +1007,7 @@ SELECT  pn.name AS NAME,
                             WHERE SPdP.server_id = :sid
                             AND SPdP.patch_id = full_list.id
                             AND SPdP.package_nevra_id = PNEVRA.id))
-ORDER BY  UPPER(NVRE)
+ORDER BY  UPPER(name || '-' || evr_t_as_vre_simple(full_list.evr))
   </query>
   <elaborator params="sid" multiple="t">
 SELECT DISTINCT PN.name AS NAME,


commit 69a1bcc647b89c36b35fcd5a735f6b521b612db4
Author: Pierre Casenove <pcasenove at gmail.com>
Date:   Tue Jun 26 07:42:51 2012 +0000

    Correcting ISE on postgresql: NVL keyword

diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
index ebf799d..ef75f53 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/System_queries.xml
@@ -1270,7 +1270,7 @@ SELECT S.id,
   SELECT 
 DISTINCT S.id,
          S.name AS SERVER_NAME,
-         NVL((SELECT 1
+         COALESCE((SELECT 1
                 FROM rhnServerFeaturesView SFV
                WHERE SFV.server_id = S.id
                  AND SFV.label = 'ftr_system_grouping'), 0) AS SELECTABLE




More information about the spacewalk-commits mailing list