rel-eng/packages web/spacewalk-web.spec
by Michael Mraka
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 631e9ff29ee5bb078ab22a9bd9b9bed39df78612
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 10 14:04:11 2011 +0200
Automatic commit of package [spacewalk-web] release [1.6.10-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index c2fb1fd..7d89c20 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.6.9-1 web/
+1.6.10-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index e0bb945..c787b6d 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site - Perl modules
Group: Applications/Internet
License: GPLv2
-Version: 1.6.9
+Version: 1.6.10
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -257,6 +257,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Wed Aug 10 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.10-1
+- replace oracle specific syntax with ANSI one
+- made NVL2 work in both db backends
+
* Mon Aug 08 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.9-1
- fixed re-activation key in PostgreSQL
12 years, 10 months
6 commits - web/modules
by Michael Mraka
web/modules/rhn/RHN/DB/DataSource/xml/CustomInfo_queries.xml | 5 -
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 2
web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml | 30 +++----
web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml | 42 +++++++---
web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml | 2
web/modules/rhn/RHN/DB/DataSource/xml/contact_method_queries.xml | 17 ++--
web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml | 6 -
7 files changed, 65 insertions(+), 39 deletions(-)
New commits:
commit 7695d3f21f2d3900be9237f2742d15a19b061ad8
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 10 11:34:51 2011 +0200
replace oracle specific syntax with ANSI one
fixing
ERROR: syntax error at or near "VERSION"
LINE 9: full_list.evr.version VERSION,
as well as (+) and DECODE
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 680ae18..e25c819 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/Package_queries.xml
@@ -1446,19 +1446,20 @@ ORDER BY UPPER(PN.name), UPPER(PE.version), UPPER(PE.release), UPPER(PE.epoch)
<mode name="system_upgradable_package_list">
<query params="sid">
-SELECT pn.id || '|' || lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release) ID,
- full_list.server_id SERVER_ID,
- pn.id NAME_ID,
- lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release) EVR_ID,
- pn.name ||'-'|| full_list.evr.version || '-' || full_list.evr.release || DECODE(full_list.evr.epoch, NULL, '', ':' || full_list.evr.epoch) NVRE,
- full_list.errata_id ERRATA_ID,
- full_list.errata_advisory ERRATA_ADVISORY,
- full_list.evr.epoch EPOCH,
- full_list.evr.version VERSION,
- full_list.evr.release RELEASE,
- E.advisory_type ERRATA_ADVISORY_TYPE,
- E.advisory_name ERRATA_ADVISORY_NAME
- FROM rhnErrata E,
+SELECT pn.id || '|' || lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release) as ID,
+ full_list.server_id as SERVER_ID,
+ pn.id as NAME_ID,
+ lookup_evr(full_list.evr.epoch, full_list.evr.version, full_list.evr.release) as EVR_ID,
+ pn.name ||'-'|| full_list.evr.version || '-' || full_list.evr.release ||
+ CASE WHEN full_list.evr.epoch IS NOT NULL THEN ':' || full_list.evr.epoch END as NVRE,
+ full_list.errata_id as ERRATA_ID,
+ full_list.errata_advisory as ERRATA_ADVISORY,
+ full_list.evr.epoch as EPOCH,
+ full_list.evr.version as VERSION,
+ full_list.evr.release as RELEASE,
+ E.advisory_type as ERRATA_ADVISORY_TYPE,
+ E.advisory_name as ERRATA_ADVISORY_NAME
+ FROM
(
SELECT SOP.package_name_id name_id, MAX(pe.evr) evr,
SOP.server_id server_id, SOP.errata_id errata_id,
@@ -1469,8 +1470,9 @@ SELECT pn.id || '|' || lookup_evr(full_list.evr.epoch, full_list.evr.version, f
GROUP BY SOP.package_name_id, SOP.server_id, SOP.errata_id, SOP.errata_advisory
) full_list,
rhnPackageName PN
+ LEFT JOIN rhnErrata E
+ ON full_list.errata_id = E.id
WHERE full_list.name_id = PN.id
- AND full_list.errata_id = E.id (+)
ORDER BY UPPER(NVRE)
</query>
</mode>
commit 60ca30539dd924f4e2ffd2b0e0a8a27bb0e8b174
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 10 12:07:20 2011 +0200
made NVL2 work in both db backends
fixing
ERROR: invalid input syntax for integer: "Y"
LINE 5: ...CFt WHERE CFT.latest_config_revision_id = CR.id), 'Y', 'N')
...
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index 24214c7..8a90e43 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -140,7 +140,7 @@ ORDER BY SN.modified DESC
FROM rhnServerTokenRegs STR
WHERE STR.token_id = RT.id
) system_count,
- NVL2((SELECT 1 FROM rhnRegTokenOrgDefault RTOD WHERE RTOD.reg_token_id = RT.id), 'Yes', 'No') org_default
+ NVL((SELECT 'Yes' FROM rhnRegTokenOrgDefault RTOD WHERE RTOD.reg_token_id = RT.id), 'No') org_default
FROM rhnActivationKey AK,
rhnRegToken RT
WHERE RT.org_id = :org_id
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
index 2f412cb..c7715b0 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/config_queries.xml
@@ -6,7 +6,7 @@ SELECT CR.id AS ID,
Csum.checksum md5sum,
CFN.path,
CR.revision,
- NVL2((SELECT 1 FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id = CR.id), 'Y', 'N') LATEST,
+ NVL((SELECT 'Y' FROM rhnConfigFile CFt WHERE CFT.latest_config_revision_id = CR.id), 'N') LATEST,
TO_CHAR(coalesce(CCon.created, CF.created), 'YYYY-MM-DD HH24:MI:SS') AS CREATED,
CASE CCT.label WHEN 'local_override' THEN '(system override)' ELSE CC.name END AS CONFIG_CHANNEL_NAME,
CC.label AS CONFIG_CHANNEL_LABEL,
commit 689bb530de187fab6f8a98185fe3cba2088fdab9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 10 11:34:51 2011 +0200
replace oracle specific syntax with ANSI one
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
index c004d7f..e89d3ad 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/probe_queries.xml
@@ -21,14 +21,14 @@ SELECT P.recid AS ID,
PS.output
FROM rhn_sat_cluster SC,
rhn_command C,
- rhn_probe P,
rhn_check_probe CP,
- rhn_probe_state PS
+ rhn_probe P
+ LEFT JOIN rhn_probe_state PS
+ ON PS.probe_id = P.recid
WHERE CP.host_id = :sid
AND CP.probe_id = P.recid
AND CP.sat_cluster_id = SC.recid
AND P.command_id = C.recid
- AND PS.probe_id(+) = P.recid
ORDER BY UPPER(PS.state)
</query>
</mode>
commit f6d4609327644d01a522465cd33022a052ff664c
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 10 11:34:51 2011 +0200
replace oracle specific syntax with ANSI one
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
index 3f6de21..01244da 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/SystemGroup_queries.xml
@@ -33,12 +33,23 @@ SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
GO.GROUP_ID AS ID, GROUP_NAME, GROUP_ADMINS, SERVER_COUNT,
NOTE_COUNT, GO.MODIFIED, GO.MAX_MEMBERS,
'unknown' AS ALL_ERRATA,
- (SELECT DECODE(
- MAX(DECODE(PS.state, 'OK', 1, 'PENDING', 2, 'UNKNOWN', 3, 'WARNING', 4, 'CRITICAL', 5)),
- 1, 'OK', 2, 'PENDING', 3, 'UNKNOWN', 4, 'WARNING', 5, 'CRITICAL') ST
- FROM rhn_check_probe CP, rhn_probe_state PS, rhnServerGroupMembership SGM
+ (SELECT CASE MAX(CASE PS.state
+ WHEN 'OK' THEN 1
+ WHEN 'PENDING' THEN 2
+ WHEN 'UNKNOWN' THEN 3
+ WHEN 'WARNING' THEN 4
+ WHEN 'CRITICAL' THEN 5
+ END)
+ WHEN 1 THEN 'OK'
+ WHEN 2 THEN 'PENDING'
+ WHEN 3 THEN 'UNKNOWN'
+ WHEN 4 THEN 'WARNING'
+ WHEN 5 THEN 'CRITICAL'
+ END) ST
+ FROM rhn_probe_state PS, rhnServerGroupMembership SGM
+ LEFT JOIN rhn_check_probe CP
+ ON SGM.server_id = CP.host_id
WHERE PS.probe_id = CP.probe_id
- AND SGM.server_id = CP.host_id(+)
AND SGM.group_id = UMSG.server_group_id
GROUP BY SGM.group_id) MONITORING_STATUS
FROM rhnVisServerGroupOverviewLite GO, rhnUserManagedServerGroups UMSG
@@ -69,12 +80,23 @@ ORDER BY UPPER(NAME)
SELECT SECURITY_ERRATA, BUG_ERRATA, ENHANCEMENT_ERRATA,
GO.GROUP_ID AS ID, GROUP_NAME, GROUP_ADMINS, SERVER_COUNT,
NOTE_COUNT, GO.MODIFIED, GO.MAX_MEMBERS,
- (SELECT DECODE(
- MAX(DECODE(PS.state, 'OK', 1, 'PENDING', 2, 'UNKNOWN', 3, 'WARNING', 4, 'CRITICAL', 5)),
- 1, 'OK', 2, 'PENDING', 3, 'UNKNOWN', 4, 'WARNING', 5, 'CRITICAL') ST
- FROM rhn_check_probe CP, rhn_probe_state PS, rhnServerGroupMembership SGM
+ (SELECT CASE MAX(CASE PS.state
+ WHEN 'OK' THEN 1
+ WHEN 'PENDING' THEN 2
+ WHEN 'UNKNOWN' THEN 3
+ WHEN 'WARNING' THEN 4
+ WHEN 'CRITICAL' THEN 5
+ END)
+ WHEN 1 THEN 'OK'
+ WHEN 2 THEN 'PENDING'
+ WHEN 3 THEN 'UNKNOWN'
+ WHEN 4 THEN 'WARNING'
+ WHEN 5 THEN 'CRITICAL'
+ END) ST
+ FROM rhn_probe_state PS, rhnServerGroupMembership SGM
+ LEFT JOIN rhn_check_probe CP
+ ON SGM.server_id = CP.host_id
WHERE PS.probe_id = CP.probe_id
- AND SGM.server_id = CP.host_id(+)
AND SGM.group_id = UMSG.server_group_id
GROUP BY SGM.group_id) MONITORING_STATUS
FROM rhnServerGroupOverview GO, rhnUserManagedServerGroups UMSG,
commit ba59e1176c35852e9f38f41a6b8d4b033f815d31
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 10 11:34:51 2011 +0200
replace oracle specific syntax with ANSI one
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/CustomInfo_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/CustomInfo_queries.xml
index 0249296..f75dce3 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/CustomInfo_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/CustomInfo_queries.xml
@@ -27,10 +27,11 @@ SELECT CDK.id,
CDK.description,
COUNT(SCDV.key_id) as system_count,
TO_CHAR(CDK.modified, 'YYYY-MM-DD HH24:MI:SS') AS LAST_MODIFIED
- FROM rhnServerCustomDataValue SCDV,
+ FROM
rhnCustomDataKey CDK
+ LEFT JOIN rhnServerCustomDataValue SCDV
+ ON CDK.id = SCDV.key_id
WHERE CDK.org_id = :org_id
- AND CDK.id = SCDV.key_id (+)
AND NOT EXISTS (
SELECT 1 FROM rhnServerCustomDataValue
WHERE server_id = :sid
commit 1b895e662c3451e23d4751d74273a93b2f1ce35f
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Wed Aug 10 11:34:51 2011 +0200
replace oracle specific syntax with ANSI one
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/contact_method_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/contact_method_queries.xml
index 579f176..64e903b 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/contact_method_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/contact_method_queries.xml
@@ -28,15 +28,16 @@ SELECT WC.id contact_id,
WC.login contact_login,
CM.recid method_id,
CM.method_name method_name,
- DECODE( MT.method_type_name,
- 'Email', CM.email_address,
- 'Pager', CM.pager_email) method_target
- FROM rhn_contact_methods CM,
- web_contact WC,
- rhn_method_types MT
+ CASE MT.method_type_name
+ WHEN 'Email' THEN CM.email_address
+ WHEN 'Pager' THEN CM.pager_email END method_target
+ FROM
+ web_contact WC
+ LEFT JOIN rhn_contact_methods CM
+ ON WC.id = CM.contact_id
+ LEFT JOIN rhn_method_types MT
+ ON CM.method_type_id = MT.recid
WHERE WC.org_id = :org_id
- AND CM.contact_id (+) = WC.id
- AND CM.method_type_id = MT.recid (+)
ORDER BY WC.login, CM.method_name
</query>
</mode>
12 years, 10 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
New commits:
commit 3d3a4d9a4a53ca24d2650bdc9ed4813a09bcb72d
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Wed Aug 10 12:03:00 2011 +0200
702084 - always print trailing newline for error messages
diff --git a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
index bacb619..359d5fc 100644
--- a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
+++ b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
@@ -92,8 +92,7 @@ def get_available_channels(user, password):
try:
key = client.auth.login(user, password)
except xmlrpclib.Fault, exc:
- sys.stderr.write("Error during client authentication: %s" % exc.faultString)
- sys.exit(1)
+ systemExit(1, "Error during client authentication: %s" % exc.faultString)
system_id = re.sub('^ID-', '', rpclib.xmlrpclib.loads(up2dateAuth.getSystemId())[0][0]['system_id'])
result = []
12 years, 10 months
Changes to 'refs/tags/rhn-client-tools-1.6.9-1'
by Martin Minar
Tag 'rhn-client-tools-1.6.9-1' created by Martin Minar <mminar(a)redhat.com> at 2011-08-10 09:18 +0000
Tagging package [rhn-client-tools] version [1.6.9-1] in directory [client/rhel/rhn-client-tools/].
Changes since spacewalk-schema-1.6.3-1:
Marcelo Moreira de Mello (1):
728638 - Fixed kickstart.profile.setAdvancedOptions() to renderize the kickstart after invocating method.
Martin Minar (1):
Automatic commit of package [rhn-client-tools] release [1.6.9-1].
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 1 +
rel-eng/packages/rhn-client-tools | 2 +-
3 files changed, 7 insertions(+), 2 deletions(-)
---
12 years, 10 months
client/rhel rel-eng/packages
by Martin Minar
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6 +++++-
rel-eng/packages/rhn-client-tools | 2 +-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 44e36bc3c206de02755ee8f9d66b85b305d4a9b5
Author: Martin Minar <mminar(a)redhat.com>
Date: Wed Aug 10 11:18:54 2011 +0200
Automatic commit of package [rhn-client-tools] release [1.6.9-1].
diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec
index ceb699a..a1b9022 100644
--- a/client/rhel/rhn-client-tools/rhn-client-tools.spec
+++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec
@@ -4,7 +4,7 @@ Group: System Environment/Base
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
URL: https://fedorahosted.org/spacewalk
Name: rhn-client-tools
-Version: 1.6.8
+Version: 1.6.9
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -339,6 +339,10 @@ make -f Makefile.rhn-client-tools test
%endif
%changelog
+* Wed Aug 10 2011 Martin Minar <mminar(a)redhat.com> 1.6.9-1
+- 684913 - fix SSLCertificateVerifyFailedError exception message
+ (mzazrivec(a)redhat.com)
+
* Fri Aug 05 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.6.8-1
- convert args to string first
diff --git a/rel-eng/packages/rhn-client-tools b/rel-eng/packages/rhn-client-tools
index 083e438..4ba8381 100644
--- a/rel-eng/packages/rhn-client-tools
+++ b/rel-eng/packages/rhn-client-tools
@@ -1 +1 @@
-1.6.8-1 client/rhel/rhn-client-tools/
+1.6.9-1 client/rhel/rhn-client-tools/
12 years, 10 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java | 1 +
1 file changed, 1 insertion(+)
New commits:
commit 7654516c7751e706113060a85dd7bf230d56b74d
Author: Marcelo Moreira de Mello <mmello(a)redhat.com>
Date: Tue Aug 9 23:12:49 2011 -0300
728638 - Fixed kickstart.profile.setAdvancedOptions() to renderize the kickstart after invocating method.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
index a51ce45..25a5565 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/ProfileHandler.java
@@ -589,6 +589,7 @@ public class ProfileHandler extends BaseHandler {
}
}
cmd.getKickstartData().setOptions(customSet);
+ KickstartFactory.saveKickstartData(ksdata);
return 1;
}
12 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.6.3-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.6.3-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-08-10 07:42 +0000
Tagging package [spacewalk-schema] version [1.6.3-1] in directory [schema/spacewalk/].
Changes since rhnlib-2.5.43-1:
Jan Pazdziora (2):
We missed ON DELETE CASCADE in the past schema upgrade scripts -- fixing now.
Automatic commit of package [spacewalk-schema] release [1.6.3-1].
Milan Zazrivec (1):
684913 - fix SSLCertificateVerifyFailedError exception message
---
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 2 +-
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/001-add-missing-cascade-on-delete.sql.oracle | 10 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/001-add-missing-cascade-on-delete.sql.postgresql | 2 ++
5 files changed, 18 insertions(+), 3 deletions(-)
---
12 years, 10 months
rel-eng/packages schema/spacewalk
by Jan Pazdziora
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 8f56f789fcf0d2722f4bd99057ef6d0296236efe
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Aug 10 09:42:55 2011 +0200
Automatic commit of package [spacewalk-schema] release [1.6.3-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index a1cf596..8e1063a 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.6.2-1 schema/spacewalk/
+1.6.3-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 4f386e3..9d65a0b 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.6.2
+Version: 1.6.3
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Wed Aug 10 2011 Jan Pazdziora 1.6.3-1
+- We missed ON DELETE CASCADE in the past schema upgrade scripts -- fixing now.
+
* Fri Jul 29 2011 Jan Pazdziora 1.6.2-1
- Adding empty directory for upgrades to 1.6.
12 years, 10 months
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/001-add-missing-cascade-on-delete.sql.oracle | 10 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/001-add-missing-cascade-on-delete.sql.postgresql | 2 ++
2 files changed, 12 insertions(+)
New commits:
commit d5ccd232dedff450db9d833532051c6f9a7bef2a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Wed Aug 10 09:42:33 2011 +0200
We missed ON DELETE CASCADE in the past schema upgrade scripts -- fixing now.
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/001-add-missing-cascade-on-delete.sql.oracle b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/001-add-missing-cascade-on-delete.sql.oracle
new file mode 100644
index 0000000..0c8324f
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/001-add-missing-cascade-on-delete.sql.oracle
@@ -0,0 +1,10 @@
+
+alter table rhnerratanotificationqueue drop constraint rhn_enqueue_cid_fk;
+alter table rhnerratanotificationqueue add constraint rhn_enqueue_cid_fk foreign key (channel_id) references rhnchannel(id) on delete cascade;
+
+alter table rhnerrataqueue drop constraint rhn_equeue_cid_fk;
+alter table rhnerrataqueue add constraint rhn_equeue_cid_fk foreign key (channel_id) references rhnchannel(id) on delete cascade;
+
+alter table rhnreleasechannelmap drop constraint rhn_rcm_cid_fk;
+alter table rhnreleasechannelmap add constraint rhn_rcm_cid_fk foreign key (channel_id) references rhnchannel(id) on delete cascade;
+
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/001-add-missing-cascade-on-delete.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/001-add-missing-cascade-on-delete.sql.postgresql
new file mode 100644
index 0000000..0535748
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.5-to-spacewalk-schema-1.6/001-add-missing-cascade-on-delete.sql.postgresql
@@ -0,0 +1,2 @@
+-- oracle equivalent source sha1 ffe09b9ada4092fc9a16f8048493442addadfd85
+-- This file is intentionally left empty.
12 years, 10 months
client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0dad9b5bd5081388d52ef43533f2afa59ea76344
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Tue Aug 9 16:37:37 2011 +0200
684913 - fix SSLCertificateVerifyFailedError exception message
Previously, the exception incorrectly called CA's certificate as SSL certificate.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
index 96029e7..3fe0476 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py
@@ -157,7 +157,7 @@ class SSLCertificateVerifyFailedError(RepoError):
RepoError.__init__(self ,"The certificate %s is expired. Please ensure you have the correct"
" certificate and your system time is correct." % certFile)
else:
- RepoError.__init__(self, "The SSL certificate %s failed verification." % certFile)
+ RepoError.__init__(self, "The SSL certificate failed verification.")
class SSLCertificateFileNotFound(Error):
pass
12 years, 10 months