backend/server/action/rhnsd.py | 4 +-
backend/spacewalk-backend.spec | 5 ++
rel-eng/packages/spacewalk-backend | 2 -
rel-eng/packages/spacewalk-web | 2 -
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 24 --------------
web/modules/sniglets/Sniglets/ListView/PackageList.pm | 4 --
web/spacewalk-web.spec | 5 ++
7 files changed, 12 insertions(+), 34 deletions(-)
New commits:
commit a60a69876a7580a1ccf0181b50ec716b53330e7f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 09:45:23 2013 +0100
Automatic commit of package [spacewalk-web] release [1.10.13-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 38a011e..21465dc 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.10.12-1 web/
+1.10.13-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index f0a9f92..01addd8 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -4,7 +4,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.10.12
+Version: 1.10.13
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk/
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -262,6 +262,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue Mar 26 2013 Jan Pazdziora 1.10.13-1
+- Mode system_available_packages not used in web/, removing.
+
* Tue Mar 26 2013 Jan Pazdziora 1.10.12-1
- Use to_timestamp instead of to_date which should bring the second precision
to PostgreSQL.
commit 3b2012ec9c1a6c0deb11ee80b3c503bfe7e64728
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 09:41:15 2013 +0100
Mode system_available_packages not used in web/, removing.
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
index 062c346..6b52186 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -1302,30 +1302,6 @@ ORDER BY UPPER(PACKAGE_NVREA)
<elaborator name="package_channels" />
</mode>
-<mode name="system_available_packages">
- <query params="sid">
-SELECT pn.name AS NAME,
- pn.name || '-' || full_list.evr.version || '-' ||
full_list.evr.release || DECODE(full_list.evr.epoch, NULL, '', ':' ||
full_list.evr.epoch) AS NVRE,
- pn.id || '|' || lookup_evr(full_list.evr.epoch, full_list.evr.version,
full_list.evr.release) AS ID
- FROM (
- SELECT p.name_id name_id, max(pe.evr) evr
- FROM rhnPackageEVR PE, rhnPackage P,
- rhnChannelPackage CP, rhnServerChannel SC
- WHERE sc.server_id = :sid
- AND sc.channel_id = cp.channel_id
- AND cp.package_id = p.id
- AND p.evr_id = pe.id
- GROUP BY p.name_id
- ) full_list,
- rhnPackageName pn
- WHERE full_list.name_id = pn.id
- AND full_list.name_id NOT IN (SELECT SP.name_id
- FROM rhnServerPackage SP
- WHERE SP.server_id = :sid)
-ORDER BY UPPER(pn.name)
- </query>
-</mode>
-
<mode name="ssm_packages_for_upgrade">
<query params="user_id">
SELECT P.id AS ID,
diff --git a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
index b0aac53..9387d06 100644
--- a/web/modules/sniglets/Sniglets/ListView/PackageList.pm
+++ b/web/modules/sniglets/Sniglets/ListView/PackageList.pm
@@ -177,10 +177,6 @@ sub _register_modes {
-datasource => RHN::DataSource::Package->new,
-action_callback => \&default_callback);
- Sniglets::ListView::List->add_mode(-mode =>
"system_available_packages",
- -datasource => RHN::DataSource::Package->new,
- -action_callback => \&default_callback);
-
Sniglets::ListView::List->add_mode(-mode =>
"system_profile_comparison",
-datasource => RHN::DataSource::Package->new,
-provider => \&profile_comparison_provider,
commit 8cf1b2b26574d0bde83bde65316689fc836e18a1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 09:45:08 2013 +0100
Automatic commit of package [spacewalk-backend] release [1.10.13-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index e741033..0d43ba7 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.10.12
+Version: 1.10.13
Release: 1%{?dist}
URL:
https://fedorahosted.org/spacewalk
Source0:
https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Mar 26 2013 Jan Pazdziora 1.10.13-1
+- Replacing DECODE with more standard CASE.
+
* Tue Mar 26 2013 Jan Pazdziora 1.10.12-1
- Use to_timestamp instead of to_date which should bring the second precision
to PostgreSQL.
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 022443b..e6b49c9 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.12-1 backend/
+1.10.13-1 backend/
commit dd11f6cac7a4be1c108a46299d765840f1481bcd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Mar 26 09:37:11 2013 +0100
Replacing DECODE with more standard CASE.
diff --git a/backend/server/action/rhnsd.py b/backend/server/action/rhnsd.py
index eacb698..61f0fd0 100644
--- a/backend/server/action/rhnsd.py
+++ b/backend/server/action/rhnsd.py
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2008--2011 Red Hat, Inc.
+# Copyright (c) 2008--2013 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
@@ -24,7 +24,7 @@ from spacewalk.common.rhnException import rhnException
__rhnexport__ = ['configure']
_query_lookup_interval = rhnSQL.Statement("""
- select interval, decode(restart, 'Y', 1, 'N', 0) restart
+ select interval, case when restart = 'Y' then 1 else 0 end as restart
from rhnActionDaemonConfig
where action_id = :action_id
""")