Changes to 'refs/tags/spacewalk-schema-1.2.29-1'
by Tomas Lestach
Tag 'spacewalk-schema-1.2.29-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2010-10-08 12:25 +0000
Tagging package [spacewalk-schema] version [1.2.29-1] in directory [schema/spacewalk/].
Changes since spacewalk-1.2.2-1:
Tomas Lestach (2):
substitute '' with null (oracle believes it's the same)
Automatic commit of package [spacewalk-schema] release [1.2.29-1].
---
rel-eng/packages/spacewalk-schema | 2 -
schema/spacewalk/common/data/rhnTaskoBunch.sql | 30 +++++++++---------
schema/spacewalk/oracle/data/rhnTaskoTemplate.sql | 36 +++++++++++-----------
schema/spacewalk/spacewalk-schema.spec | 5 ++-
4 files changed, 38 insertions(+), 35 deletions(-)
---
13 years, 8 months
rel-eng/packages schema/spacewalk
by Tomas Lestach
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 3afd649285c3f68211459cb19f573b42f0aa2df0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Oct 8 14:25:43 2010 +0200
Automatic commit of package [spacewalk-schema] release [1.2.29-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index a54aadb..a4f4924 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.2.28-1 schema/spacewalk/
+1.2.29-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 52d268b..baa2726 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.28
+Version: 1.2.29
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -59,6 +59,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-schema-upgrade*
%changelog
+* Fri Oct 08 2010 Tomas Lestach <tlestach(a)redhat.com> 1.2.29-1
+- substitute '' with null (oracle believes it's the same) (tlestach(a)redhat.com)
+
* Thu Oct 07 2010 Partha Aji <paji(a)redhat.com> 1.2.28-1
- 641145: Updated kickstart timezone and install information needed for Rhel 6
profiles (paji(a)redhat.com)
13 years, 8 months
schema/spacewalk
by Tomas Lestach
schema/spacewalk/common/data/rhnTaskoBunch.sql | 30 +++++++++---------
schema/spacewalk/oracle/data/rhnTaskoTemplate.sql | 36 +++++++++++-----------
2 files changed, 33 insertions(+), 33 deletions(-)
New commits:
commit c84fbb8d2e35d6c637f0ab1f743effababd62e29
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Oct 8 14:24:02 2010 +0200
substitute '' with null (oracle believes it's the same)
diff --git a/schema/spacewalk/common/data/rhnTaskoBunch.sql b/schema/spacewalk/common/data/rhnTaskoBunch.sql
index 4338063..2720f49 100644
--- a/schema/spacewalk/common/data/rhnTaskoBunch.sql
+++ b/schema/spacewalk/common/data/rhnTaskoBunch.sql
@@ -15,7 +15,7 @@
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'daily-status-bunch', 'Sends daily report', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'daily-status-bunch', 'Sends daily report', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
VALUES (rhn_tasko_bunch_id_seq.nextval, 'sat-sync-bunch', 'Runs satellite-sync
@@ -28,48 +28,48 @@ INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
VALUES (rhn_tasko_bunch_id_seq.nextval, 'clear-taskologs-bunch', 'Clears taskomatic run log history
Parameters:
- days parameter specifies age of logs to be kept
-- without parameter default value will be used', '');
+- without parameter default value will be used', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'cobbler-sync-bunch', 'Applies any cobbler configuration changes', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'cobbler-sync-bunch', 'Applies any cobbler configuration changes', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'compare-configs-bunch', 'Schedules a comparison of config files on all systems', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'compare-configs-bunch', 'Schedules a comparison of config files on all systems', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'clean-alerts-bunch', 'Clears current monitoring alerts', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'clean-alerts-bunch', 'Clears current monitoring alerts', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'sync-probe-bunch', 'Calls the synch probe state proc', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'sync-probe-bunch', 'Calls the synch probe state proc', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'session-cleanup-bunch', 'Deletes expired rows from the PXTSessions table to keep it from growing too large', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'session-cleanup-bunch', 'Deletes expired rows from the PXTSessions table to keep it from growing too large', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'sandbox-cleanup-bunch', 'Clean up sandbox', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'sandbox-cleanup-bunch', 'Clean up sandbox', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
VALUES (rhn_tasko_bunch_id_seq.nextval, 'repo-sync-bunch', 'Used for syncing repos to a channel', 'Y');
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'package-cleanup-bunch', 'Cleans up orphaned packages', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'package-cleanup-bunch', 'Cleans up orphaned packages', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'kickstartfile-sync-bunch', 'Syncs kickstart profiles that were generated using the wizard', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'kickstartfile-sync-bunch', 'Syncs kickstart profiles that were generated using the wizard', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'kickstart-cleanup-bunch', 'Cleans up stale Kickstarts', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'kickstart-cleanup-bunch', 'Cleans up stale Kickstarts', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'errata-queue-bunch', 'Processes errata', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'errata-queue-bunch', 'Processes errata', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'errata-cache-bunch', 'Performs errata cache recalc for a given server or channel', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'errata-cache-bunch', 'Performs errata cache recalc for a given server or channel', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'channel-repodata-bunch', 'Generates channel repodata', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'channel-repodata-bunch', 'Generates channel repodata', null);
INSERT INTO rhnTaskoBunch (id, name, description, org_bunch)
- VALUES (rhn_tasko_bunch_id_seq.nextval, 'satcert-check-bunch', 'Checks whether satellite certificate has not expired', '');
+ VALUES (rhn_tasko_bunch_id_seq.nextval, 'satcert-check-bunch', 'Checks whether satellite certificate has not expired', null);
commit;
diff --git a/schema/spacewalk/oracle/data/rhnTaskoTemplate.sql b/schema/spacewalk/oracle/data/rhnTaskoTemplate.sql
index 310d746..a020066 100644
--- a/schema/spacewalk/oracle/data/rhnTaskoTemplate.sql
+++ b/schema/spacewalk/oracle/data/rhnTaskoTemplate.sql
@@ -19,7 +19,7 @@ INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
(SELECT id FROM rhnTaskoBunch WHERE name='daily-status-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='summary-population'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
@@ -33,118 +33,118 @@ INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
(SELECT id FROM rhnTaskoBunch WHERE name='sat-sync-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='satellite-sync'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='clear-taskologs-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='clear-log-history'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='cobbler-sync-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='cobbler-sync'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='compare-configs-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='compare-config-files'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='clean-alerts-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='clean-current-alerts'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='sync-probe-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='sync-probe-state'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='session-cleanup-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='session-cleanup'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='sandbox-cleanup-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='sandbox-cleanup'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='repo-sync-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='repo-sync'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='package-cleanup-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='package-cleanup'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='kickstartfile-sync-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='kickstartfile-sync'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='kickstart-cleanup-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='kickstart-cleanup'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='errata-queue-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='errata-queue'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='errata-queue-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='errata-mailer'),
1,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='channel-repodata-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='channel-repodata'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='satcert-check-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='sat-cert-check'),
0,
- '');
+ null);
INSERT INTO rhnTaskoTemplate (id, bunch_id, task_id, ordering, start_if)
VALUES (rhn_tasko_template_id_seq.nextval,
(SELECT id FROM rhnTaskoBunch WHERE name='errata-cache-bunch'),
(SELECT id FROM rhnTaskoTask WHERE name='errata-cache'),
0,
- '');
+ null);
commit;
13 years, 8 months
Changes to 'refs/tags/spacewalk-1.2.2-1'
by Jan Pazdziora
Tag 'spacewalk-1.2.2-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-08 11:49 +0000
Tagging package [spacewalk] version [1.2.2-1] in directory [spacewalk/package/].
Changes since spacewalk-java-1.2.56-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk] release [1.2.2-1].
---
rel-eng/packages/spacewalk | 2 +-
spacewalk/package/spacewalk.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
---
13 years, 8 months
rel-eng/packages spacewalk/package
by Jan Pazdziora
rel-eng/packages/spacewalk | 2 +-
spacewalk/package/spacewalk.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 4170129c0120bf43cb1263f00cf0fe83b44c667d
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 8 13:49:50 2010 +0200
Automatic commit of package [spacewalk] release [1.2.2-1].
diff --git a/rel-eng/packages/spacewalk b/rel-eng/packages/spacewalk
index 8318253..9f8b0dd 100644
--- a/rel-eng/packages/spacewalk
+++ b/rel-eng/packages/spacewalk
@@ -1 +1 @@
-1.2.1-1 spacewalk/package/
+1.2.2-1 spacewalk/package/
diff --git a/spacewalk/package/spacewalk.spec b/spacewalk/package/spacewalk.spec
index 228bee6..3ac95e5 100644
--- a/spacewalk/package/spacewalk.spec
+++ b/spacewalk/package/spacewalk.spec
@@ -1,7 +1,7 @@
%define release_name Smile
Name: spacewalk
-Version: 1.2.1
+Version: 1.2.2
Release: 1%{?dist}
Summary: Spacewalk Systems Management Application
URL: https://fedorahosted.org/spacewalk
@@ -167,6 +167,10 @@ rm -rf %{buildroot}
%{_datadir}/spacewalk/setup/defaults.d/postgresql-backend.conf
%changelog
+* Fri Oct 08 2010 Jan Pazdziora 1.2.2-1
+- Moving the quartz-oracle Requires from spacewalk-taskomatic to spacewalk-
+ oracle.
+
* Wed Aug 11 2010 Jan Pazdziora 1.2.1-1
- The dependency of python-psycopg2 (which replaced python-pgsql) is in
spacewalk-backend-sql-postgresql, no need to have it in spacewalk-postgresql
13 years, 8 months
Changes to 'refs/tags/spacewalk-java-1.2.56-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.2.56-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-08 11:49 +0000
Tagging package [spacewalk-java] version [1.2.56-1] in directory [java/].
Changes since spacewalk-web-1.2.11-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.2.56-1].
---
java/spacewalk-java.spec | 14 +++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
---
13 years, 8 months
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 14 +++++++++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 14 insertions(+), 2 deletions(-)
New commits:
commit 693b88d89ede1d192fe712550121c9abb2cba851
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 8 13:49:13 2010 +0200
Automatic commit of package [spacewalk-java] release [1.2.56-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 62c199a..19fa03d 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.55
+Version: 1.2.56
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -337,6 +337,18 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Oct 08 2010 Jan Pazdziora 1.2.56-1
+- PostgreSQL does not like to ORDER BY by something which is not in DISTINCT.
+- Since query Channel.findAllBaseChannels was replaced with sql-query, removing
+ the query.
+- The query visible_to_user_ids-back does not seem to be referenced from
+ anywhere, removing.
+- Moving the quartz-oracle Requires from spacewalk-taskomatic to spacewalk-
+ oracle.
+- Replace nvl with coalesce in user_permissions.
+- Removing unused import and fixed checkstyle. (slukasik(a)redhat.com)
+- Added missing javadoc (internal class) (lzap+git(a)redhat.com)
+
* Thu Oct 07 2010 Jan Pazdziora 1.2.55-1
- Use current_timestamp instead of the Oracle-specific sysdate in
schedule_pkg_for_delete_from_set.
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 3c3ccb1..37bbe9e 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.2.55-1 java/
+1.2.56-1 java/
13 years, 8 months
Changes to 'refs/tags/spacewalk-web-1.2.11-1'
by Jan Pazdziora
Tag 'spacewalk-web-1.2.11-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2010-10-08 11:48 +0000
Tagging package [spacewalk-web] version [1.2.11-1] in directory [web/].
Changes since spacewalk-proxy-monitoring-1.2.1-1:
Jan Pazdziora (7):
Replace nvl with coalesce in user_permissions.
Moving the quartz-oracle Requires from spacewalk-taskomatic to spacewalk-oracle.
The query visible_to_user_ids-back does not seem to be referenced from anywhere, removing.
Since query Channel.findAllBaseChannels was replaced with sql-query, removing the query.
PostgreSQL does not like to ORDER BY by something which is not in DISTINCT.
Move use DBD::Oracle to eval so that we do not get rpm dependencies populated.
Automatic commit of package [spacewalk-web] release [1.2.11-1].
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml | 20 +---------
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 7 ---
java/spacewalk-java.spec | 1
rel-eng/packages/spacewalk-web | 2 -
spacewalk/package/spacewalk.spec | 1
web/modules/rhn/RHN/DB.pm | 2 -
web/spacewalk-web.spec | 6 ++-
7 files changed, 11 insertions(+), 28 deletions(-)
---
13 years, 8 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 007cfec154393d8930912e709477b01cf11b7628
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 8 13:48:45 2010 +0200
Automatic commit of package [spacewalk-web] release [1.2.11-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index b2b3502..4a57a4a 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.2.10-1 web/
+1.2.11-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 5d5af2e..7c23955 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.2.10
+Version: 1.2.11
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -256,6 +256,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Oct 08 2010 Jan Pazdziora 1.2.11-1
+- Move use DBD::Oracle to eval so that we do not get rpm dependencies
+ populated.
+
* Wed Oct 06 2010 Jan Pazdziora 1.2.10-1
- Use current_timestamp instead of the Oracle-specific sysdate in
set_cloned_from.
13 years, 8 months
2 commits - java/code web/modules
by Jan Pazdziora
java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml | 2 ++
web/modules/rhn/RHN/DB.pm | 2 +-
2 files changed, 3 insertions(+), 1 deletion(-)
New commits:
commit fd42e1b6e0ff968b12a78566c7930b67d0125141
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 8 13:39:19 2010 +0200
Move use DBD::Oracle to eval so that we do not get rpm dependencies populated.
In the future we shall add a test for driver being Oracle but I was
not able to find reproducer where encode_blob / RHN::DB::Type::BLOB
would be used, so this is only a rpm-fixing change.
diff --git a/web/modules/rhn/RHN/DB.pm b/web/modules/rhn/RHN/DB.pm
index 5f6a266..a92530c 100644
--- a/web/modules/rhn/RHN/DB.pm
+++ b/web/modules/rhn/RHN/DB.pm
@@ -528,12 +528,12 @@ sub execute_h {
$self->set_err("Odd number of params to execute_h") if @params % 2;
while (my ($k, $v) = (splice @params, 0, 2, ())) {
- use DBD::Oracle qw(:ora_types);
my $attr = {};
use Scalar::Util qw/blessed/;
if (ref $v and blessed($v) and $v->isa("RHN::DB::Type::BLOB")) {
+ eval 'use DBD::Oracle qw(:ora_types)' or die $@;
$attr->{ora_type} = ORA_BLOB;
if (defined $v->{ora_field}) {
$attr->{ora_field} = $v->{ora_field};
commit 7c7d4dfe71d0fd7adb54157fec15fa8dde9050dd
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Oct 8 09:42:30 2010 +0200
PostgreSQL does not like to ORDER BY by something which is not in DISTINCT.
Addressing
org.postgresql.util.PSQLException: ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list
at org.postgresql.core.v3.QueryExecutorImpl.receiveErrorResponse(QueryExecutorImpl.java:1525)
at org.postgresql.core.v3.QueryExecutorImpl.processResults(QueryExecutorImpl.java:1309)
at org.postgresql.core.v3.QueryExecutorImpl.execute(QueryExecutorImpl.java:188)
at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:452)
at org.postgresql.jdbc2.AbstractJdbc2Statement.executeWithFlags(AbstractJdbc2Statement.java:354)
at org.postgresql.jdbc2.AbstractJdbc2Statement.execute(AbstractJdbc2Statement.java:347)
at com.mchange.v2.c3p0.impl.NewProxyPreparedStatement.execute(NewProxyPreparedStatement.java:651)
at com.redhat.rhn.common.db.NamedPreparedStatement.execute(NamedPreparedStatement.java:139)
at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:454)
at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:431)
at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:335)
at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:340)
at com.redhat.rhn.common.db.datasource.CachedStatement.execute(CachedStatement.java:280)
at com.redhat.rhn.common.db.datasource.SelectMode.execute(SelectMode.java:105)
at com.redhat.rhn.manager.BaseManager.makeDataResult(BaseManager.java:57)
at com.redhat.rhn.manager.system.SystemManager.groupList(SystemManager.java:639)
at com.redhat.rhn.frontend.action.systems.SystemGroupListSetupAction.execute(SystemGroupListSetupAction.java:63)
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
index e9f0b76..710f979 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/SystemGroup_queries.xml
@@ -74,11 +74,13 @@ ORDER BY UPPER(GROUP_NAME), GO.GROUP_ID
<query name="visible_to_user_ids" params="user_id">
+select * from (
SELECT DISTINCT SG.id AS ID, SG.name AS NAME
FROM rhnServerGroup SG, rhnUserManagedServerGroups UMSG
WHERE UMSG.user_id = :user_id
AND UMSG.server_group_id = SG.id
AND SG.group_type IS NULL
+) x
ORDER BY UPPER(NAME)
</query>
13 years, 8 months