client/rhel rel-eng/packages
by Šimon Lukašík
client/rhel/spacewalk-oscap/spacewalk-oscap.spec | 5 ++++-
rel-eng/packages/spacewalk-oscap | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 836e08d8ae99f8675169690d364f28cd6cf1feb1
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Apr 30 16:41:10 2012 +0200
Automatic commit of package [spacewalk-oscap] release [0.0.8-1].
diff --git a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
index 297bb32..c76a856 100644
--- a/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
+++ b/client/rhel/spacewalk-oscap/spacewalk-oscap.spec
@@ -1,5 +1,5 @@
Name: spacewalk-oscap
-Version: 0.0.7
+Version: 0.0.8
Release: 1%{?dist}
Summary: OpenSCAP plug-in for rhn-check
@@ -43,6 +43,9 @@ rm -rf $RPM_BUILD_ROOT
%changelog
+* Mon Apr 30 2012 Simon Lukasik <slukasik(a)redhat.com> 0.0.8-1
+- Do not pass empty string as parameter to oscap tool. (slukasik(a)redhat.com)
+
* Fri Apr 27 2012 Jan Pazdziora 0.0.7-1
- Spacewalk-oscap requires oscap tool of particular version.
(slukasik(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-oscap b/rel-eng/packages/spacewalk-oscap
index 1fc5561..da0002b 100644
--- a/rel-eng/packages/spacewalk-oscap
+++ b/rel-eng/packages/spacewalk-oscap
@@ -1 +1 @@
-0.0.7-1 client/rhel/spacewalk-oscap/
+0.0.8-1 client/rhel/spacewalk-oscap/
12 years
5 commits - backend/server client/rhel java/code
by Šimon Lukašík
backend/server/action/scap.py | 5 ---
backend/server/action_extra_data/scap.py | 10 ++++++-
client/rhel/spacewalk-oscap/scap.py | 9 +++++-
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 3 ++
java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf | 13 +++++++---
5 files changed, 30 insertions(+), 10 deletions(-)
New commits:
commit 5f7036273f7102e907e336cf184fa1f15b576513
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Apr 30 14:52:37 2012 +0200
Assign a dummy profile when none is selected.
diff --git a/backend/server/action_extra_data/scap.py b/backend/server/action_extra_data/scap.py
index b4329b6..0fd3d37 100644
--- a/backend/server/action_extra_data/scap.py
+++ b/backend/server/action_extra_data/scap.py
@@ -34,7 +34,7 @@ def xccdf_eval(server_id, action_id, data={}):
resume = xml.dom.minidom.parseString(data['resume'])
benchmark = resume.getElementsByTagName('benchmark-resume')[0]
- profiles = benchmark.getElementsByTagName('profile')
+ profiles = benchmark.getElementsByTagName('profile') or [_dummyDefaultProfile()]
testresults = benchmark.getElementsByTagName('TestResult')
if len(profiles) < 1 or len(testresults) < 1:
log_error('Scap report misses profile or testresult element')
@@ -118,6 +118,14 @@ def _get_text(node):
rc.append(node.data)
return ''.join(rc)
+class _dummyDefaultProfile:
+ def getAttribute(self, name):
+ if name == 'id':
+ return 'None'
+ elif name == 'title':
+ return 'No profile selected. Using defaults.'
+ return ''
+
_query_clear_tresult = rhnSQL.Statement("""
delete from rhnXccdfTestresult
where server_id = :server_id
commit b1095dcee5b38413a973b3872773aae57f0d9a75
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Apr 30 14:46:45 2012 +0200
Do not divide by zero. It prints a question mark.
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index 537b712..98ead2e 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -11961,6 +11961,9 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<trans-unit id="system.audit.listscap.jsp.fixed">
<source>Fixed</source>
</trans-unit>
+ <trans-unit id="system.audit.listscap.jsp.na">
+ <source>N/A</source>
+ </trans-unit>
</group>
<group>
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
index 7c5a84a..4491c6e 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/audit/scap-list.jspf
@@ -12,9 +12,16 @@
${current.completionTime}
</rl:column>
<rl:column headerkey="system.audit.listscap.jsp.percentage">
- <fmt:formatNumber maxFractionDigits="0"
- value="${current.pass * 100 / (current.sum - current.notselected - current.informational)}"/>
- %
+ <c:choose>
+ <c:when test="${current.sum - current.notselected - current.informational == 0}">
+ <bean:message key="system.audit.listscap.jsp.na"/>
+ </c:when>
+ <c:otherwise>
+ <fmt:formatNumber maxFractionDigits="0"
+ value="${current.pass * 100 / (current.sum - current.notselected - current.informational)}"/>
+ %
+ </c:otherwise>
+ </c:choose>
</rl:column>
<rl:column headerkey="system.audit.listscap.jsp.pass.abb">
<c:choose>
commit db1cca17cc501c8a90e94b5b6846a2c3b718db46
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Apr 30 14:04:54 2012 +0200
Do not pass empty string as parameter to oscap tool.
diff --git a/client/rhel/spacewalk-oscap/scap.py b/client/rhel/spacewalk-oscap/scap.py
index cfcf46d..e9a21b6 100644
--- a/client/rhel/spacewalk-oscap/scap.py
+++ b/client/rhel/spacewalk-oscap/scap.py
@@ -16,8 +16,13 @@ def xccdf_eval(args, cache_only=None):
return (0, 'no-ops for caching', {})
results_file = tempfile.NamedTemporaryFile()
- oscap_err = _run_oscap(['xccdf', 'eval', '--results', results_file.name]
- + args['params'].split(' ') + [args['path']])
+ if args['params']:
+ oscap_err = _run_oscap(['xccdf', 'eval', '--results', results_file.name]
+ + args['params'].split(' ') + [args['path']])
+ else:
+ oscap_err = _run_oscap(['xccdf', 'eval', '--results', results_file.name]
+ + [args['path']])
+
if not _assert_xml(results_file.name):
return (1, 'oscap tool did not produce valid xml.\n' + oscap_err, {})
commit 64cb02be588b11fb2931b2fc8225f72c65a985d3
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Apr 30 13:04:10 2012 +0200
xccdf_eval should not send null value
As per today a scan needs additional parameters to complete.
None the less omission should be still possible.
Addressing:
Exception Handler Information
Traceback (most recent call last):
File "/usr/lib/python2.4/site-packages/spacewalk/server/apacheRequest.py", line 122, in call_function
response = apply(func, params)
File "/usr/share/rhn/server/handlers/xmlrpc/queue.py", line 329, in get
ret = self.__getV2(action)
File "/usr/share/rhn/server/handlers/xmlrpc/queue.py", line 95, in __getV2
xmlblob = xmlrpclib.dumps(result, methodname=action['method'])
File "/usr/lib64/python2.4/xmlrpclib.py", line 1029, in dumps
data = m.dumps(params)
File "/usr/lib64/python2.4/xmlrpclib.py", line 603, in dumps
dump(v, write)
File "/usr/lib64/python2.4/xmlrpclib.py", line 615, in __dump
f(self, value, write)
File "/usr/lib64/python2.4/xmlrpclib.py", line 696, in dump_struct
dump(v, write)
File "/usr/lib64/python2.4/xmlrpclib.py", line 615, in __dump
f(self, value, write)
File "/usr/lib64/python2.4/xmlrpclib.py", line 619, in dump_nil
raise TypeError, "cannot marshal None unless allow_none is enabled"
TypeError: cannot marshal None unless allow_none is enabled
diff --git a/backend/server/action/scap.py b/backend/server/action/scap.py
index 8c1ef46..d587a79 100644
--- a/backend/server/action/scap.py
+++ b/backend/server/action/scap.py
@@ -33,5 +33,5 @@ def xccdf_eval(server_id, action_id, dry_run=0):
"%s for server %s" % (action_id, server_id))
return ({
'path': dict['path'],
- 'params': rhnSQL.read_lob(dict['parameters'])
+ 'params': rhnSQL.read_lob(dict['parameters']) or ''
},)
commit 89ffcd278d02e259a61ee6d7ffd87ddd93b2e9f3
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Mon Apr 30 12:51:07 2012 +0200
Removing unhelpful assignment.
diff --git a/backend/server/action/scap.py b/backend/server/action/scap.py
index 1503b64..8c1ef46 100644
--- a/backend/server/action/scap.py
+++ b/backend/server/action/scap.py
@@ -31,9 +31,6 @@ def xccdf_eval(server_id, action_id, dry_run=0):
if not dict:
raise InvalidAction("scap.xccdf_eval: Unknown action id "
"%s for server %s" % (action_id, server_id))
- data = {
- 'params': dict['parameters'],
- 'path': dict['path']}
return ({
'path': dict['path'],
'params': rhnSQL.read_lob(dict['parameters'])
12 years
Changes to 'refs/tags/spacewalk-java-1.8.59-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.59-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-30 13:30 +0000
Tagging package [spacewalk-java] version [1.8.59-1] in directory [java/].
Changes since spacewalk-java-1.8.58-1:
Jan Pazdziora (2):
811470 - fixing checkstyle.
Automatic commit of package [spacewalk-java] release [1.8.59-1].
---
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java | 16 +++++-----
java/spacewalk-java.spec | 5 ++-
rel-eng/packages/spacewalk-java | 2 -
3 files changed, 13 insertions(+), 10 deletions(-)
---
12 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 14f8ec431e3cd94e39a759b98578b2405c19aab3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Apr 30 15:30:44 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.59-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7ce8bc5..f40c793 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.58
+Version: 1.8.59
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Apr 30 2012 Jan Pazdziora 1.8.59-1
+- 811470 - fixing checkstyle.
+
* Mon Apr 30 2012 Jan Pazdziora 1.8.58-1
- Requires are better defined elsewhere than in template. (slukasik(a)redhat.com)
- API: Show OpenSCAP XCCDF Details. (slukasik(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 90f2b9a..773c25c 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.58-1 java/
+1.8.59-1 java/
12 years
java/code
by Jan Pazdziora
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java | 16 +++++-----
1 file changed, 8 insertions(+), 8 deletions(-)
New commits:
commit e2b9efc78a48cf742e263b6075aa178b13a096ea
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Apr 30 15:29:56 2012 +0200
811470 - fixing checkstyle.
Addressing
Starting audit...
./code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java:411: Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java:455: Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java:501: Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java:547: Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java:587: Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java:651: Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java:716: Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java:756: Line is longer than 92 characters.
Audit done.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
index 17c94fc..0cd3182 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java
@@ -408,7 +408,7 @@ public class SystemDetailsHandler extends BaseHandler {
/**
* Returns the set of all keys associated with the indicated kickstart profile.
*
- * @param sessionKey identifies the user's session; cannot be <code>null</code>
+ * @param sessionKey user's session; cannot be <code>null</code>
* @param kickstartLabel identifies the profile; cannot be <code>null</code>
* @return set of all keys associated with the given profile
*
@@ -452,7 +452,7 @@ public class SystemDetailsHandler extends BaseHandler {
/**
* Adds the given list of keys to the specified kickstart profile.
*
- * @param sessionKey identifies the user's session; cannot be <code>null</code>
+ * @param sessionKey user's session; cannot be <code>null</code>
* @param kickstartLabel identifies the profile; cannot be <code>null</code>
* @param descriptions list identifiying the keys to add
* @return 1 if the associations were performed correctly
@@ -498,7 +498,7 @@ public class SystemDetailsHandler extends BaseHandler {
/**
* Removes the given list of keys from the specified kickstart profile.
*
- * @param sessionKey identifies the user's session; cannot be <code>null</code>
+ * @param sessionKey user's session; cannot be <code>null</code>
* @param kickstartLabel identifies the profile; cannot be <code>null</code>
* @param descriptions list identifiying the keys to remove
* @return 1 if the associations were performed correctly
@@ -544,7 +544,7 @@ public class SystemDetailsHandler extends BaseHandler {
* Returns the set of all file preservations associated with the given kickstart
* profile.
*
- * @param sessionKey identifies the user's session; cannot be <code>null</code>
+ * @param sessionKey user's session; cannot be <code>null</code>
* @param kickstartLabel identifies the profile; cannot be <code>null</code>
* @throws FaultException A FaultException is thrown if:
* - The sessionKey is invalid
@@ -584,7 +584,7 @@ public class SystemDetailsHandler extends BaseHandler {
/**
* Adds the given list of file preservations to the specified kickstart profile.
*
- * @param sessionKey identifies the user's session; cannot be <code>null</code>
+ * @param sessionKey user's session; cannot be <code>null</code>
* @param kickstartLabel identifies the profile; cannot be <code>null</code>
* @param filePreservations list identifying the file preservations to add
* @throws FaultException A FaultException is thrown if:
@@ -648,7 +648,7 @@ public class SystemDetailsHandler extends BaseHandler {
/**
* Removes the given list of file preservations from the specified kickstart profile.
*
- * @param sessionKey identifies the user's session; cannot be <code>null</code>
+ * @param sessionKey user's session; cannot be <code>null</code>
* @param kickstartLabel identifies the profile; cannot be <code>null</code>
* @param filePreservations list identifying the file preservations to remove
* @throws FaultException A FaultException is thrown if:
@@ -713,7 +713,7 @@ public class SystemDetailsHandler extends BaseHandler {
/**
* Sets the registration type of a given kickstart profile.
*
- * @param sessionKey identifies the user's session; cannot be <code>null</code>
+ * @param sessionKey user's session; cannot be <code>null</code>
* @param kickstartLabel identifies the profile; cannot be <code>null</code>
* @param registrationType registration type
* @throws FaultException A FaultException is thrown if:
@@ -753,7 +753,7 @@ public class SystemDetailsHandler extends BaseHandler {
/**
* Returns the registration type of a given kickstart profile.
*
- * @param sessionKey identifies the user's session; cannot be <code>null</code>
+ * @param sessionKey user's session; cannot be <code>null</code>
* @param kickstartLabel identifies the profile; cannot be <code>null</code>
* @throws FaultException A FaultException is thrown if:
* - The sessionKey is invalid
12 years
Changes to 'refs/tags/spacewalk-java-1.8.58-1'
by Jan Pazdziora
Tag 'spacewalk-java-1.8.58-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-30 13:09 +0000
Tagging package [spacewalk-java] version [1.8.58-1] in directory [java/].
Changes since spacewalk-schema-1.8.25-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-java] release [1.8.58-1].
---
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
---
12 years
java/spacewalk-java.spec rel-eng/packages
by Jan Pazdziora
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 7756c4776a4f7764f2ca3009ebc7497eb65359a3
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Apr 30 15:09:09 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.58-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 79e1197..7ce8bc5 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -22,7 +22,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.57
+Version: 1.8.58
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -605,6 +605,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Apr 30 2012 Jan Pazdziora 1.8.58-1
+- Requires are better defined elsewhere than in template. (slukasik(a)redhat.com)
+- API: Show OpenSCAP XCCDF Details. (slukasik(a)redhat.com)
+- 811470 - proper use of xml entities in documentation (mzazrivec(a)redhat.com)
+
* Fri Apr 27 2012 Jan Pazdziora 1.8.57-1
- API: List Xccdf Scans for given machine. (slukasik(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c09abfc..90f2b9a 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.57-1 java/
+1.8.58-1 java/
12 years
Changes to 'refs/tags/spacewalk-schema-1.8.25-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.8.25-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-04-30 09:47 +0000
Tagging package [spacewalk-schema] version [1.8.25-1] in directory [schema/spacewalk/].
Changes since spacewalk-oscap-0.0.7-1:
Jan Pazdziora (2):
Fix the order for the arm schema upgrade scripts.
Automatic commit of package [spacewalk-schema] release [1.8.25-1].
Milan Zazrivec (1):
811470 - proper use of xml entities in documentation
Simon Lukasik (2):
API: Show OpenSCAP XCCDF Details.
Requires are better defined elsewhere than in template.
---
java/code/src/com/redhat/rhn/domain/audit/ScapFactory.java | 16 +
java/code/src/com/redhat/rhn/domain/audit/XccdfTestResult.hbm.xml | 11 +
java/code/src/com/redhat/rhn/frontend/action/systems/audit/ScapSetupAction.java | 3
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 6
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java | 6
java/code/src/com/redhat/rhn/frontend/xmlrpc/kickstart/profile/system/SystemDetailsHandler.java | 32 +--
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/SerializerRegistry.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerActionSerializer.java | 8
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/XccdfTestResultSerializer.java | 95 ++++++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 16 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 6
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/scap/SystemScapHandler.java | 25 ++
java/code/webapp/WEB-INF/pages/systems/details/audit/listscap.jsp | 2
java/code/webapp/WEB-INF/pages/systems/details/audit/schedulexccdf.jsp | 2
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/spacewalk-schema.spec | 5
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql | 8
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql | 44 ----
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql | 44 ++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql | 8
20 files changed, 247 insertions(+), 93 deletions(-)
---
12 years
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 d0354e89257c662317baf96a0d975fb2c29aa6c7
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Apr 30 11:47:30 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.25-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index b3cc819..2a494da 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.24-1 schema/spacewalk/
+1.8.25-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 2ba0dfe..e58cf24 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.8.24
+Version: 1.8.25
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Mon Apr 30 2012 Jan Pazdziora 1.8.25-1
+- Fix the order for the arm schema upgrade scripts.
+
* Fri Apr 27 2012 Jan Pazdziora 1.8.24-1
- We cannot specify tablespace for PostgreSQL.
12 years
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql | 8 -
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql | 44 ----------
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql | 44 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql | 8 +
4 files changed, 52 insertions(+), 52 deletions(-)
New commits:
commit 4dcf2467f706b98784dcf156bda18154cf30a554
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Apr 30 11:37:21 2012 +0200
Fix the order for the arm schema upgrade scripts.
Addressing
'SPACEWALK-SCHEMA-1.7-TO-SPACEWALK-SCHEMA-1.8/035-SUPPORT-FOR-ARMV5-CHANNEL.SQ
------------------------------------------------------------------------------
spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql
1 row created.
values (LOOKUP_CHANNEL_ARCH('channel-armv5'), LOOKUP_PACKAGE_ARCH('armv5tel'))
*
ERROR at line 2:
ORA-20243: (package_arch_not_found) - Package architecture could not be found
ORA-06512: at "SPACEUSER0.RHN_EXCEPTION", line 31
ORA-06512: at "SPACEUSER0.LOOKUP_PACKAGE_ARCH", line 19
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql
deleted file mode 100644
index e5c4845..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv5-channel.sql
+++ /dev/null
@@ -1,8 +0,0 @@
-insert into rhnChannelArch (id, label, name, arch_type_id) values
- (sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv5', 'ARMv5', lookup_arch_type('rpm'));
-
-insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
- values (LOOKUP_CHANNEL_ARCH('channel-armv5'), LOOKUP_PACKAGE_ARCH('armv5tel'));
-
-insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
- (LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv5'));
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql
deleted file mode 100644
index 90528a3..0000000
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/035-support-for-armv7.sql
+++ /dev/null
@@ -1,44 +0,0 @@
-insert into rhnChannelArch (id, label, name, arch_type_id) values
- (sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv7', 'ARMv7', lookup_arch_type('rpm'));
-
-insert into rhnPackageArch (id, label, name, arch_type_id) values
- (sequence_nextval('rhn_package_arch_id_seq'), 'armv7hl', 'ARMv7hl', lookup_arch_type('rpm'));
-insert into rhnPackageArch (id, label, name, arch_type_id) values
- (sequence_nextval('rhn_package_arch_id_seq'), 'armv7l', 'ARMv7l', lookup_arch_type('rpm'));
-insert into rhnPackageArch (id, label, name, arch_type_id) values
- (sequence_nextval('rhn_package_arch_id_seq'), 'armv5tel', 'ARMv5tel', lookup_arch_type('rpm'));
-
-insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
- values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7hl'));
-
-insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
- values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7l'));
-insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
- values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv5tel'));
-
-insert into rhnServerArch (id, label, name, arch_type_id) values
-(sequence_nextval('rhn_server_arch_id_seq'), 'armv7l-redhat-linux', 'armv7l', lookup_arch_type('rpm'));
-
-
-insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
-(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv7'));
-
-
-insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
- values (lookup_server_arch('armv7l-redhat-linux'),
- lookup_sg_type('sw_mgr_entitled'));
-insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
- values (lookup_server_arch('armv7l-redhat-linux'),
- lookup_sg_type('enterprise_entitled'));
-insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
- values (lookup_server_arch('armv7l-redhat-linux'),
- lookup_sg_type('provisioning_entitled'));
-insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
- values (lookup_server_arch('armv7l-redhat-linux'),
- lookup_sg_type('monitoring_entitled'));
-insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
- values (lookup_server_arch('armv7l-redhat-linux'),
- lookup_sg_type('virtualization_host'));
-
-insert into rhnCpuArch (id, label, name) values
-(sequence_nextval('rhn_cpu_arch_id_seq'), 'armv7l', 'ARMv7l');
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
new file mode 100644
index 0000000..90528a3
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/036-support-for-armv7.sql
@@ -0,0 +1,44 @@
+insert into rhnChannelArch (id, label, name, arch_type_id) values
+ (sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv7', 'ARMv7', lookup_arch_type('rpm'));
+
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+ (sequence_nextval('rhn_package_arch_id_seq'), 'armv7hl', 'ARMv7hl', lookup_arch_type('rpm'));
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+ (sequence_nextval('rhn_package_arch_id_seq'), 'armv7l', 'ARMv7l', lookup_arch_type('rpm'));
+insert into rhnPackageArch (id, label, name, arch_type_id) values
+ (sequence_nextval('rhn_package_arch_id_seq'), 'armv5tel', 'ARMv5tel', lookup_arch_type('rpm'));
+
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+ values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7hl'));
+
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+ values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv7l'));
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+ values (LOOKUP_CHANNEL_ARCH('channel-armv7'), LOOKUP_PACKAGE_ARCH('armv5tel'));
+
+insert into rhnServerArch (id, label, name, arch_type_id) values
+(sequence_nextval('rhn_server_arch_id_seq'), 'armv7l-redhat-linux', 'armv7l', lookup_arch_type('rpm'));
+
+
+insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
+(LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv7'));
+
+
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('sw_mgr_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('enterprise_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('provisioning_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('monitoring_entitled'));
+insert into rhnServerServerGroupArchCompat ( server_arch_id, server_group_type )
+ values (lookup_server_arch('armv7l-redhat-linux'),
+ lookup_sg_type('virtualization_host'));
+
+insert into rhnCpuArch (id, label, name) values
+(sequence_nextval('rhn_cpu_arch_id_seq'), 'armv7l', 'ARMv7l');
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
new file mode 100644
index 0000000..e5c4845
--- /dev/null
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.7-to-spacewalk-schema-1.8/037-support-for-armv5-channel.sql
@@ -0,0 +1,8 @@
+insert into rhnChannelArch (id, label, name, arch_type_id) values
+ (sequence_nextval('rhn_channel_arch_id_seq'), 'channel-armv5', 'ARMv5', lookup_arch_type('rpm'));
+
+insert into rhnChannelPackageArchCompat (channel_arch_id, package_arch_id)
+ values (LOOKUP_CHANNEL_ARCH('channel-armv5'), LOOKUP_PACKAGE_ARCH('armv5tel'));
+
+insert into rhnServerChannelArchCompat (server_arch_id, channel_arch_id) values
+ (LOOKUP_SERVER_ARCH('armv7l-redhat-linux'), LOOKUP_CHANNEL_ARCH('channel-armv5'));
12 years