backend/server/rhnServer/server_kickstart.py | 2 +-
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 7 insertions(+), 3 deletions(-)
New commits:
commit ff78451ff4c77efcb17329c93d59aeb9c46135cb
Author: Aron Parsons <parsonsa(a)bit-sys.com>
Date: Wed Sep 28 11:02:24 2011 -0400
Automatic commit of package [spacewalk-backend] release [1.6.22-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 3ef4fff..36dac85 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.6.21
+Version: 1.6.22
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -674,6 +674,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Wed Sep 28 2011 Aron Parsons <parsonsa(a)bit-sys.com> 1.6.22-1
+- use COALESCE instead of NVL for compatibility with PostgreSQL (parsonsa@bit-
+
sys.com)
+
* Thu Sep 22 2011 Aron Parsons <parsonsa(a)bit-sys.com> 1.6.21-1
- fix broken --list-channels option (parsonsa(a)bit-sys.com)
- Fix nvl2/case conversion (Joshua.Roys(a)gtri.gatech.edu)
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 875c573..ab0addb 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.6.21-1 backend/
+1.6.22-1 backend/
commit b7d84d91cac8d0361e500a3d9628583d63d509ad
Author: Aron Parsons <parsonsa(a)bit-sys.com>
Date: Wed Sep 28 11:00:25 2011 -0400
use COALESCE instead of NVL for compatibility with PostgreSQL
this fixes a traceback generated from client registration during a
Kickstart session when using PostgreSQL as the backend
diff --git a/backend/server/rhnServer/server_kickstart.py
b/backend/server/rhnServer/server_kickstart.py
index 1739d3d..91be103 100644
--- a/backend/server/rhnServer/server_kickstart.py
+++ b/backend/server/rhnServer/server_kickstart.py
@@ -424,7 +424,7 @@ select c.id
rhnPrivateChannelFamily pcf
where pcf.org_id = :org_id
and pcf.channel_family_id = cfm.channel_family_id
- and pcf.current_members < nvl(pcf.max_members,
+ and pcf.current_members < coalesce(pcf.max_members,
pcf.current_members + 1)
union
select cfm.channel_id