client/rhel
by Milan Zazrivec
client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 5feb72eef8563482be7276818d9f6d769918bb0f
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Fri Mar 30 12:59:44 2012 +0200
804559 - correct string catenation
Traceback (most recent call last):
File "/usr/sbin/rhn-channel", line 162, in <module>
systemExit(1, e)
File "/usr/sbin/rhn-channel", line 46, in systemExit
sys.stderr.write(rhncli.utf8_encode(msg)+'\n')
<type 'exceptions.TypeError'>: unsupported operand type(s) for +: 'CommunicationError' and 'str'
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 e0a0cc7..be06576 100644
--- a/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
+++ b/client/rhel/rhn-client-tools/src/bin/spacewalk-channel.py
@@ -43,7 +43,7 @@ def systemExit(code, msgs=None):
if type(msgs) not in [type([]), type(())]:
msgs = (msgs, )
for msg in msgs:
- sys.stderr.write(rhncli.utf8_encode(msg)+'\n')
+ sys.stderr.write(rhncli.utf8_encode(msg.value) + "\n")
sys.exit(code)
# quick check to see if you are a super-user.
12 years, 1 month
java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml | 12 +
java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java | 83 ++++++++++
java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java | 42 +++++
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 27 +++
java/code/src/com/redhat/rhn/manager/audit/ScapManager.java | 15 +
java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp | 53 ++++++
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 18 +-
java/code/webapp/WEB-INF/struts-config.xml | 9 +
8 files changed, 250 insertions(+), 9 deletions(-)
New commits:
commit 3bfc9df89219aa4e2c41d8902b7fd974f09024cb
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Thu Mar 29 20:19:33 2012 +0200
New web page -- details of the xccdf:rule-result
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml
index deb69b8..3f810df 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/scap_queries.xml
@@ -34,7 +34,7 @@
<mode name="show_ruleresults" class="com.redhat.rhn.frontend.dto.XccdfRuleResultDto">
<query params="xid">
- SELECT rr.id, rrt.label
+ SELECT rr.id, rrt.label, rr.testresult_id as test_result_id
FROM rhnXccdfRuleresult rr,
rhnXccdfRuleresultType rrt
WHERE rr.testresult_id = :xid
@@ -43,6 +43,16 @@
</query>
</mode>
+<mode name="ruleresult_by_id" class="com.redhat.rhn.frontend.dto.XccdfRuleResultDto">
+ <query params="rr_id">
+ SELECT rr.id, rrt.label, rr.testresult_id as test_result_id
+ FROM rhnXccdfRuleresult rr,
+ rhnXccdfRuleresultType rrt
+ WHERE rr.id = :rr_id
+ AND rr.result_id = rrt.id
+ </query>
+</mode>
+
<mode name="idents_per_ruleresult" class="com.redhat.rhn.frontend.dto.XccdfIdentDto">
<query params="rr_id">
SELECT xi.id, xi.identifier, xis.system
diff --git a/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java
new file mode 100644
index 0000000..40ca594
--- /dev/null
+++ b/java/code/src/com/redhat/rhn/frontend/action/systems/audit/RuleDetailsAction.java
@@ -0,0 +1,83 @@
+/**
+ * Copyright (c) 2012 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
+ * implied, including the implied warranties of MERCHANTABILITY or FITNESS
+ * FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
+ * along with this software; if not, see
+ * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
+ *
+ * Red Hat trademarks are not licensed under GPLv2. No permission is
+ * granted to use or replicate Red Hat trademarks that are incorporated
+ * in this software or its documentation.
+ */
+package com.redhat.rhn.frontend.action.systems.audit;
+
+import java.util.List;
+
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+
+import com.redhat.rhn.domain.server.Server;
+import com.redhat.rhn.domain.user.User;
+import com.redhat.rhn.frontend.dto.XccdfRuleResultDto;
+import com.redhat.rhn.frontend.struts.RequestContext;
+import com.redhat.rhn.frontend.struts.RhnAction;
+import com.redhat.rhn.frontend.struts.RhnHelper;
+import com.redhat.rhn.frontend.taglibs.list.ListTagHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.ListHelper;
+import com.redhat.rhn.frontend.taglibs.list.helper.Listable;
+import com.redhat.rhn.manager.audit.ScapManager;
+import com.redhat.rhn.manager.system.SystemManager;
+
+/**
+ * RuleDetailsAction
+ * @version $Rev$
+ */
+
+public class RuleDetailsAction extends RhnAction implements Listable {
+
+ /**
+ * {@inheritDoc}
+ */
+ public ActionForward execute(ActionMapping mapping, ActionForm formIn,
+ HttpServletRequest request,
+ HttpServletResponse response) {
+ RequestContext context = new RequestContext(request);
+ User user = context.getLoggedInUser();
+ Long sid = context.getRequiredParam("sid");
+ Server server = SystemManager.lookupByIdAndUser(sid, user);
+ Long ruleResultId = context.getRequiredParam("rrid");
+ XccdfRuleResultDto ruleResult = ScapManager.ruleResultById(ruleResultId);
+
+ request.setAttribute("ruleResult", ruleResult);
+ request.setAttribute("system", server);
+
+ ListHelper helper = new ListHelper(this, request);
+ helper.execute();
+
+ request.setAttribute(ListTagHelper.PARENT_URL,
+ request.getRequestURI() + "?sid=" + sid + "&rrid=" + ruleResultId);
+
+ return mapping.findForward(RhnHelper.DEFAULT_FORWARD);
+ }
+
+ /**
+ * {@inheritDoc}
+ */
+ public List getResult(RequestContext context) {
+ Long ruleResultId = context.getRequiredParam("rrid");
+ XccdfRuleResultDto ruleResult = ScapManager.ruleResultById(ruleResultId);
+ if (ruleResult == null) {
+ return null;
+ }
+ else {
+ return ruleResult.getIdentsWithoutIdref();
+ }
+ }
+}
diff --git a/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java b/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java
index 2e842d0..6865840 100644
--- a/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java
+++ b/java/code/src/com/redhat/rhn/frontend/dto/XccdfRuleResultDto.java
@@ -14,8 +14,11 @@
*/
package com.redhat.rhn.frontend.dto;
+import java.util.ArrayList;
import java.util.List;
+import com.redhat.rhn.domain.audit.ScapFactory;
+import com.redhat.rhn.domain.audit.XccdfTestResult;
import com.redhat.rhn.manager.audit.ScapManager;
/**
@@ -26,6 +29,7 @@ public class XccdfRuleResultDto {
private Long id;
private String label;
+ private Long testResultId;
private List<XccdfIdentDto> idents;
/**
@@ -61,6 +65,30 @@ public class XccdfRuleResultDto {
}
/**
+ * Returns id of parent xccdf:TestResult
+ * @return the id
+ */
+ public Long getTestResultId() {
+ return this.testResultId;
+ }
+
+ /**
+ * Sets the id of parent xccdf:TestResult
+ * @param testResultIdIn to set
+ */
+ public void setTestResultId(Long testResultIdIn) {
+ testResultId = testResultIdIn;
+ }
+
+ /**
+ * Returns the parent testResult
+ * @return the parent testResult
+ */
+ public XccdfTestResult getTestResult() {
+ return ScapFactory.lookupTestResultById(this.testResultId);
+ }
+
+ /**
* Get idref attribute of xccdf:rule-result
* @return idref attribute
*/
@@ -74,6 +102,20 @@ public class XccdfRuleResultDto {
}
/**
+ * Get idents without idref
+ * @return list of idents without the idref
+ */
+ public List<XccdfIdentDto> getIdentsWithoutIdref() {
+ List<XccdfIdentDto> result = new ArrayList<XccdfIdentDto>();
+ for (XccdfIdentDto i : getIdents()) {
+ if (!i.isDocumentIdref()) {
+ result.add(i);
+ }
+ }
+ return result;
+ }
+
+ /**
* Return summary of xccdf:idents in xccdf:rule-result
* @return comma separated list of xccdf:ident identifiers
*/
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 4e1e624..4fc5d98 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
@@ -11900,6 +11900,33 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
</trans-unit>
</group>
+ <group>
+ <context-group name="ctx">
+ <context context-type="sourcefile">Detailed view of single SCAP XCCDF rule-result</context>
+ </context-group>
+ <trans-unit id="system.audit.ruledetails.jsp.heading">
+ <source>Details of Rule Result</source>
+ </trans-unit>
+ <trans-unit id="system.audit.ruledetails.jsp.idref">
+ <source>Reference within Document</source>
+ </trans-unit>
+ <trans-unit id="system.audit.ruledetails.jsp.result">
+ <source>Evaluation Result</source>
+ </trans-unit>
+ <trans-unit id="system.audit.ruledetails.jsp.parent">
+ <source>Parent Scan</source>
+ </trans-unit>
+ <trans-unit id="system.audit.ruledetails.jsp.assignedidents">
+ <source>Assigned Ident Tags</source>
+ </trans-unit>
+ <trans-unit id="system.audit.ruledetails.jsp.system">
+ <source>Naming System</source>
+ </trans-unit>
+ <trans-unit id="system.audit.ruledetails.jsp.ident">
+ <source>Identifier</source>
+ </trans-unit>
+ </group>
+
<!-- Action common -->
<group>
<context-group name="ctx">
diff --git a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
index 8f03779..3040932 100644
--- a/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
+++ b/java/code/src/com/redhat/rhn/manager/audit/ScapManager.java
@@ -25,6 +25,7 @@ import com.redhat.rhn.common.db.datasource.SelectMode;
import com.redhat.rhn.domain.server.Server;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.dto.XccdfIdentDto;
+import com.redhat.rhn.frontend.dto.XccdfRuleResultDto;
import com.redhat.rhn.manager.BaseManager;
/**
@@ -77,6 +78,20 @@ public class ScapManager extends BaseManager {
}
/**
+ * Get xccdf:rule-result by id
+ * @param ruleResultId of the XccdfRuleResult
+ * @return the result
+ */
+ public static XccdfRuleResultDto ruleResultById(Long ruleResultId) {
+ SelectMode m = ModeFactory.getMode("scap_queries",
+ "ruleresult_by_id");
+ HashMap params = new HashMap();
+ params.put("rr_id", ruleResultId);
+ List<XccdfRuleResultDto> result = (List<XccdfRuleResultDto>) m.execute(params);
+ return result.isEmpty() ? null : result.get(0);
+ }
+
+ /**
* Show xccdf:ident results for given rule-result
* @param ruleResultId of XccdfRuleResultDto
* @return the list of idents
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp
new file mode 100644
index 0000000..babd448
--- /dev/null
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/ruledetails.jsp
@@ -0,0 +1,53 @@
+<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
+<%@ taglib uri="http://rhn.redhat.com/tags/list" prefix="rl" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt" %>
+
+<html:xhtml/>
+<html>
+
+<body>
+
+<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
+
+<h2><bean:message key="system.audit.ruledetails.jsp.heading"/></h2>
+<rhn:csrf/>
+
+<table class="details">
+ <tr>
+ <th><bean:message key="system.audit.ruledetails.jsp.idref"/>:</th>
+ <td><c:out value="${ruleResult.documentIdref}"/></td>
+ </tr>
+ <tr>
+ <th><bean:message key="system.audit.ruledetails.jsp.result"/>:</th>
+ <td><c:out value="${ruleResult.label}"/></td>
+ </tr>
+ <tr>
+ <th><bean:message key="system.audit.ruledetails.jsp.parent"/>:</th>
+ <td>
+ <a href="/rhn/systems/details/audit/XccdfDetails.do?sid=${param.sid}&xid=${ruleResult.testResult.id}">
+ <c:out value="${ruleResult.testResult.identifier}"/>
+ </a>
+ </td>
+ </tr>
+</table>
+
+<h2><bean:message key="system.audit.ruledetails.jsp.assignedidents"/></h2>
+
+<rl:listset name="groupSet">
+ <rl:list>
+ <rhn:csrf/>
+
+ <rl:column headerkey="system.audit.ruledetails.jsp.system" sortattr="system" sortable="true">
+ <c:out value="${current.system}"/>
+ </rl:column>
+ <rl:column headerkey="system.audit.ruledetails.jsp.ident" sortattr="identifier" sortable="true">
+ <c:out value="${current.identifier}"/>
+ </rl:column>
+ </rl:list>
+</rl:listset>
+
+</body>
+</html>
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
index 87a4b10..59ff6c9 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp
@@ -57,14 +57,16 @@
<rhn:csrf/>
<rl:column headerkey="system.audit.xccdfdetails.jsp.idref" sortattr="documentIdref" sortable="true">
- <c:choose>
- <c:when test="${empty current.documentIdref}">
- <bean:message key="system.audit.xccdfdetails.jsp.unknown"/>
- </c:when>
- <c:otherwise>
- <c:out value="${current.documentIdref}"/>
- </c:otherwise>
- </c:choose>
+ <a href="/rhn/systems/details/audit/RuleDetails.do?sid=${param.sid}&rrid=${current.id}">
+ <c:choose>
+ <c:when test="${empty current.documentIdref}">
+ <bean:message key="system.audit.xccdfdetails.jsp.unknown"/>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${current.documentIdref}"/>
+ </c:otherwise>
+ </c:choose>
+ </a>
</rl:column>
<rl:column headerkey="system.audit.xccdfdetails.jsp.idents" sortattr="identsString" sortable="true">
diff --git a/java/code/webapp/WEB-INF/struts-config.xml b/java/code/webapp/WEB-INF/struts-config.xml
index ad0ca4d..e20aa63 100644
--- a/java/code/webapp/WEB-INF/struts-config.xml
+++ b/java/code/webapp/WEB-INF/struts-config.xml
@@ -2849,6 +2849,15 @@
path="/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp"/>
</action>
+ <action path="/systems/details/audit/RuleDetails"
+ scope="request"
+ input="/WEB-INF/pages/systems/details/audit/ruledetails.jsp"
+ type="com.redhat.rhn.frontend.action.systems.audit.RuleDetailsAction"
+ className="com.redhat.rhn.frontend.struts.RhnActionMapping">
+ <forward name="default"
+ path="/WEB-INF/pages/systems/details/audit/ruledetails.jsp"/>
+ </action>
+
<!-- ===== SYSTEMS DETAILS ===== -->
<action path="/systems/details/packages/Packages"
scope="request"
12 years, 1 month
Changes to 'refs/tags/spacewalk-schema-1.8.13-1'
by Jan Pazdziora
Tag 'spacewalk-schema-1.8.13-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-03-30 07:25 +0000
Tagging package [spacewalk-schema] version [1.8.13-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.8.31-1:
Jan Pazdziora (2):
Add dependency for rhnXccdfRuleIdentMap to force order.
Automatic commit of package [spacewalk-schema] release [1.8.13-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/tables/tables.deps | 1 +
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
3 files changed, 6 insertions(+), 2 deletions(-)
---
12 years, 1 month
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 092c81c0e0d9b2bfba92fdfc6a3b06cbc232bae6
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 30 09:25:46 2012 +0200
Automatic commit of package [spacewalk-schema] release [1.8.13-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 3541ba2..f4197d8 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.8.12-1 schema/spacewalk/
+1.8.13-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 8608b5f..df3fef5 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.12
+Version: 1.8.13
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -69,6 +69,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri Mar 30 2012 Jan Pazdziora 1.8.13-1
+- Add dependency for rhnXccdfRuleIdentMap to force order.
+
* Thu Mar 29 2012 Simon Lukasik <slukasik(a)redhat.com> 1.8.12-1
- Fix SHA1 of oracle sources. (slukasik(a)redhat.com)
12 years, 1 month
schema/spacewalk
by Jan Pazdziora
schema/spacewalk/common/tables/tables.deps | 1 +
1 file changed, 1 insertion(+)
New commits:
commit af816ed30f7ee46c77bf55967e7410931570fd1a
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Fri Mar 30 09:19:01 2012 +0200
Add dependency for rhnXccdfRuleIdentMap to force order.
Addressing
REFERENCES rhnXccdfRuleresult (id)
*
ERROR at line 5:
ORA-00942: table or view does not exist
diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps
index d608ab1..989affe 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -261,3 +261,4 @@ rhnActionScap :: rhnAction
rhnXccdfIdent :: rhnXccdfIdentSystem
rhnXccdfRuleresult :: rhnXccdfTestresult rhnXccdfIdent rhnXccdfRuleresultType
rhnXccdfTestresult :: rhnServer rhnActionScap rhnXccdfBenchmark rhnXccdfProfile
+rhnXccdfRuleIdentMap :: rhnXccdfRuleresult
12 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.8.31-1'
by StephenHerr
Tag 'spacewalk-java-1.8.31-1' created by Stephen Herr <sherr(a)redhat.com> at 2012-03-29 20:12 +0000
Tagging package [spacewalk-java] version [1.8.31-1] in directory [java/].
Changes since spacecmd-1.8.2-1:
Stephen Herr (3):
808162 - Auto-import the RHEL RPM GPG key for systems we have kickstarted
808210 - Fixing ISE on selecting None yum checksum type for channel
Automatic commit of package [spacewalk-java] release [1.8.31-1].
---
java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 28 +++++-----
java/conf/cobbler/snippets/redhat_register | 3 +
java/spacewalk-java.spec | 8 ++
rel-eng/packages/spacewalk-java | 2
4 files changed, 27 insertions(+), 14 deletions(-)
---
12 years, 1 month
java/spacewalk-java.spec rel-eng/packages
by StephenHerr
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 4b4f98f402ab6dbcb7382d393f1131dd44f9ea2e
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Mar 29 16:12:09 2012 -0400
Automatic commit of package [spacewalk-java] release [1.8.31-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 27cad61..2fc7361 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.30
+Version: 1.8.31
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -604,6 +604,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Mar 29 2012 Stephen Herr <sherr(a)redhat.com> 1.8.31-1
+- 808210 - Fixing ISE on selecting None yum checksum type for channel
+ (sherr(a)redhat.com)
+- 808162 - Auto-import the RHEL RPM GPG key for systems we have kickstarted
+ (sherr(a)redhat.com)
+
* Thu Mar 29 2012 Simon Lukasik <slukasik(a)redhat.com> 1.8.30-1
- Rework web interface to correspond with 0-n rule/ident mapping
(slukasik(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 32c8681..593096d 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.30-1 java/
+1.8.31-1 java/
12 years, 1 month
java/code
by StephenHerr
java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 28 +++++-----
1 file changed, 16 insertions(+), 12 deletions(-)
New commits:
commit 879273153fe9867d423baee3397e59a2a273658c
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Mar 29 16:06:23 2012 -0400
808210 - Fixing ISE on selecting None yum checksum type for channel
diff --git a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
index 83904e2..28a2d95 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java
@@ -88,8 +88,8 @@ public class UpdateChannelCommand extends CreateChannelCommand {
* valid base channel.
*/
public Channel update(Long cid)
- throws InvalidChannelLabelException, InvalidChannelNameException,
- InvalidParentChannelException {
+ throws InvalidChannelLabelException, InvalidChannelNameException,
+ InvalidParentChannelException {
verifyRequiredParameters();
verifyChannelName(name);
@@ -107,17 +107,21 @@ public class UpdateChannelCommand extends CreateChannelCommand {
throw new IllegalArgumentException("Invalid architecture label");
}
- ChecksumType ct = ChannelFactory.findChecksumTypeByLabel(checksum);
- if (ct == null) {
- throw new InvalidChecksumLabelException(checksum);
+ ChecksumType ct = null;
+ // RHEL <= 4 does not use yum and therefore does not have a checksum
+ if (!checksum.equals("")) {
+ ct = ChannelFactory.findChecksumTypeByLabel(checksum);
+ if (ct == null) {
+ throw new InvalidChecksumLabelException(checksum);
+ }
+ if (checksumChanged(c.getChecksumTypeLabel(), ct) &&
+ c.getPackageCount() > 0) {
+ // schedule repo re generation if the checksum type changed
+ // and the channel has packages
+ ChannelManager.queueChannelChange(c.getLabel(),
+ "java::updateChannelCommon", null);
+ }
}
- if (checksumChanged(c.getChecksumTypeLabel(), ct) && c.getPackageCount() > 0) {
- // schedule repo re generation if the checksum type changed
- // and the channel has packages
- ChannelManager.queueChannelChange(c.getLabel(),
- "java::updateChannelCommon", null);
- }
-
c.setName(name);
c.setSummary(summary);
c.setDescription(description);
12 years, 1 month
java/conf
by StephenHerr
java/conf/cobbler/snippets/redhat_register | 3 +++
1 file changed, 3 insertions(+)
New commits:
commit 091f0d2410436170f304d8bd25639f6dbbcac35d
Author: Stephen Herr <sherr(a)redhat.com>
Date: Thu Mar 29 13:59:37 2012 -0400
808162 - Auto-import the RHEL RPM GPG key for systems we have kickstarted
diff --git a/java/conf/cobbler/snippets/redhat_register b/java/conf/cobbler/snippets/redhat_register
index 0ad01a6..bcd4e1f 100644
--- a/java/conf/cobbler/snippets/redhat_register
+++ b/java/conf/cobbler/snippets/redhat_register
@@ -6,6 +6,9 @@ mkdir -p /usr/share/rhn/
#set $mycert = "/usr/share/rhn/" + $mycert_file
wget http://$redhat_management_server/pub/RHN-ORG-TRUSTED-SSL-CERT -O $mycert
perl -npe 's/RHNS-CA-CERT/$mycert_file/g' -i /etc/sysconfig/rhn/*
+if [ -f /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release ]
+ rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-redhat-release
+fi
#end if
#if $redhat_management_type == "hosted"
#set $mycert = "/usr/share/rhn/RHNS-CA-CERT"
12 years, 1 month
Changes to 'refs/tags/spacecmd-1.8.2-1'
by shardy
Tag 'spacecmd-1.8.2-1' created by Steven Hardy <shardy(a)redhat.com> at 2012-03-29 13:37 +0000
Tagging package [spacecmd] version [1.8.2-1] in directory [spacecmd/].
Changes since spacewalk-oscap-0.0.6-1:
Steven Hardy (15):
spacecmd enhancement : Allow config-channel export of b64 encoded files
spacecmd enhancement : Add --quick mode to softwarechannel_adderrata
spacecmd enhancement : softwarechannel_adderrata add --skip mode
spacecmd : Add validation to softwarechannel_adderrata channel args
spacecmd : Workaround missing date key in recent spacewalk listErrata
spacecmd enhancement : cryptokey_delete add support for globbing
spacecmd enhancement : Add cryptokey_details globbing support
spacecmd enhancement : custominfo_deletekey add support for globbing key names
spacecmd enhancement : custominfo_details add support for globbing key names
spacecmd : Cleanup some typos in comments
spacecmd enhancement : Add globbing support to distribution_delete
spacecmd enhancement : Add globbing support to distribution_details
spacecmd bugfix : softwarechannel_adderrata mergeErrata should be cloneErrataAsOriginal
spacecmd : softwarechannel_clone avoid ISE on duplicate name
Automatic commit of package [spacecmd] release [1.8.2-1].
---
rel-eng/packages/spacecmd | 2
spacecmd/spacecmd.spec | 31 +++++++
spacecmd/src/lib/configchannel.py | 30 +++++--
spacecmd/src/lib/cryptokey.py | 30 ++++++-
spacecmd/src/lib/custominfo.py | 27 ++++++
spacecmd/src/lib/distribution.py | 48 +++++++++---
spacecmd/src/lib/softwarechannel.py | 140 +++++++++++++++++++++++-------------
spacecmd/src/lib/utils.py | 7 +
8 files changed, 237 insertions(+), 78 deletions(-)
---
12 years, 1 month