Changes to 'refs/tags/spacewalk-schema-1.10.42-1'
by StephenHerr
Tag 'spacewalk-schema-1.10.42-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-05-31 19:03 +0000
Tagging package [spacewalk-schema] version [1.10.42-1] in directory [schema/spacewalk/].
Changes since spacewalk-java-1.10.88-1:
Stephen Herr (2):
948335 - Don't default to 1 cpu socket
Automatic commit of package [spacewalk-schema] release [1.10.42-1].
Tomas Lestach (2):
minor changes to java-create-page.pl
fix more checkstyle issues in the java-create-page.pl
---
java/scripts/hbm-templates/javaheader.txt | 4 +---
java/scripts/java-templates/actionbody.txt | 9 +++++----
java/scripts/java-templates/struts-template.xml | 2 +-
java/scripts/java-templates/testbody.txt | 6 ++----
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/tables/rhnCpu.sql | 3 +--
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql | 2 +-
8 files changed, 16 insertions(+), 17 deletions(-)
---
10 years
2 commits - rel-eng/packages schema/spacewalk
by StephenHerr
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/common/tables/rhnCpu.sql | 3 +--
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql | 2 +-
4 files changed, 7 insertions(+), 5 deletions(-)
New commits:
commit 45d248c1fd7c199a8c9d28eccc96cf238f78cc3d
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri May 31 15:03:22 2013 -0400
Automatic commit of package [spacewalk-schema] release [1.10.42-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index c7b6f08..ba9c45b 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.41-1 schema/spacewalk/
+1.10.42-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index da13bb5..ba86fb7 100644
--- a/schema/spacewalk/spacewalk-schema.spec
+++ b/schema/spacewalk/spacewalk-schema.spec
@@ -4,7 +4,7 @@ Name: spacewalk-schema
Group: Applications/Internet
Summary: Oracle SQL schema for Spacewalk server
-Version: 1.10.41
+Version: 1.10.42
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Fri May 31 2013 Stephen Herr <sherr(a)redhat.com> 1.10.42-1
+- 948335 - Don't default to 1 cpu socket
+
* Wed May 29 2013 Simon Lukasik <slukasik(a)redhat.com> 1.10.41-1
- Do not use identifiers of excessive length for constraints.
commit cfaee23bfef0a7be8d9f755b8b3932560c1ddfd9
Author: Stephen Herr <sherr(a)redhat.com>
Date: Fri May 31 15:02:50 2013 -0400
948335 - Don't default to 1 cpu socket
diff --git a/schema/spacewalk/common/tables/rhnCpu.sql b/schema/spacewalk/common/tables/rhnCpu.sql
index 36231d0..d6a7bd4 100644
--- a/schema/spacewalk/common/tables/rhnCpu.sql
+++ b/schema/spacewalk/common/tables/rhnCpu.sql
@@ -36,8 +36,7 @@ CREATE TABLE rhnCpu
vendor VARCHAR2(32),
nrcpu NUMBER
DEFAULT (1),
- nrsocket NUMBER
- DEFAULT (1),
+ nrsocket NUMBER,
acpiVersion VARCHAR2(64),
apic VARCHAR2(32),
apmVersion VARCHAR2(32),
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql
index 731b335..15b77ba 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/010-add_rhncpu_nrsocket.sql
@@ -1 +1 @@
-ALTER TABLE rhnCpu ADD nrsocket NUMBER default (1);
+ALTER TABLE rhnCpu ADD nrsocket NUMBER;
10 years
java/scripts
by Tomas Lestach
java/scripts/hbm-templates/javaheader.txt | 2 --
java/scripts/java-templates/actionbody.txt | 5 +++--
java/scripts/java-templates/struts-template.xml | 2 +-
java/scripts/java-templates/testbody.txt | 2 --
4 files changed, 4 insertions(+), 7 deletions(-)
New commits:
commit d099f7bce4d65484485f3ce53e6deb6cacc3bca4
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 31 15:31:24 2013 +0200
fix more checkstyle issues in the java-create-page.pl
diff --git a/java/scripts/hbm-templates/javaheader.txt b/java/scripts/hbm-templates/javaheader.txt
index 5b614b7..380fa69 100644
--- a/java/scripts/hbm-templates/javaheader.txt
+++ b/java/scripts/hbm-templates/javaheader.txt
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* 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 ###PACKAGE###;
diff --git a/java/scripts/java-templates/actionbody.txt b/java/scripts/java-templates/actionbody.txt
index 76f9e20..ee6e0ca 100644
--- a/java/scripts/java-templates/actionbody.txt
+++ b/java/scripts/java-templates/actionbody.txt
@@ -1,12 +1,13 @@
/** {@inheritDoc} */
- public ActionForward execute (ActionMapping mapping,
+ public ActionForward execute(ActionMapping mapping,
ActionForm formIn,
HttpServletRequest request,
HttpServletResponse response) {
Map params = makeParamMap(request);
- return StrutsDelegate.getInstance().forwardParams(mapping.findForward("default"), params);
+ return StrutsDelegate.getInstance().forwardParams(
+ mapping.findForward("default"), params);
}
diff --git a/java/scripts/java-templates/struts-template.xml b/java/scripts/java-templates/struts-template.xml
index 976f22b..eef4ab8 100644
--- a/java/scripts/java-templates/struts-template.xml
+++ b/java/scripts/java-templates/struts-template.xml
@@ -1,4 +1,4 @@
- <!-- IMPORTED ACTION - PLEASE MOVE TO PROPER LOCATION
+ <!-- IMPORTED ACTION - PLEASE MOVE TO PROPER LOCATION
<action path="###ACTIONPATH###"
scope="request"
input="/WEB-INF/pages/###JSPPATH###"
diff --git a/java/scripts/java-templates/testbody.txt b/java/scripts/java-templates/testbody.txt
index 0677a79..cce28e5 100644
--- a/java/scripts/java-templates/testbody.txt
+++ b/java/scripts/java-templates/testbody.txt
@@ -1,6 +1,5 @@
/**
* Copyright (c) 2013 Red Hat, Inc.
- * All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
* version 2 (GPLv2). There is NO WARRANTY for this software, express or
@@ -12,7 +11,6 @@
* 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 ###PACKAGE###;
10 years
java/scripts
by Tomas Lestach
java/scripts/hbm-templates/javaheader.txt | 2 +-
java/scripts/java-templates/actionbody.txt | 4 ++--
java/scripts/java-templates/testbody.txt | 4 ++--
3 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 26d1f88b679d0282e59353256127a7007f3b15ca
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri May 31 15:16:43 2013 +0200
minor changes to java-create-page.pl
diff --git a/java/scripts/hbm-templates/javaheader.txt b/java/scripts/hbm-templates/javaheader.txt
index f8fe03d..5b614b7 100644
--- a/java/scripts/hbm-templates/javaheader.txt
+++ b/java/scripts/hbm-templates/javaheader.txt
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008--2012 Red Hat, Inc.
+ * Copyright (c) 2013 Red Hat, Inc.
* All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
diff --git a/java/scripts/java-templates/actionbody.txt b/java/scripts/java-templates/actionbody.txt
index 1c51481..76f9e20 100644
--- a/java/scripts/java-templates/actionbody.txt
+++ b/java/scripts/java-templates/actionbody.txt
@@ -4,9 +4,9 @@
ActionForm formIn,
HttpServletRequest request,
HttpServletResponse response) {
-
+
Map params = makeParamMap(request);
-
+
return StrutsDelegate.getInstance().forwardParams(mapping.findForward("default"), params);
}
diff --git a/java/scripts/java-templates/testbody.txt b/java/scripts/java-templates/testbody.txt
index 43939b4..0677a79 100644
--- a/java/scripts/java-templates/testbody.txt
+++ b/java/scripts/java-templates/testbody.txt
@@ -1,5 +1,5 @@
/**
- * Copyright (c) 2008--2012 Red Hat, Inc.
+ * Copyright (c) 2013 Red Hat, Inc.
* All Rights Reserved.
*
* This software is licensed to you under the GNU General Public License,
@@ -24,7 +24,7 @@ import com.redhat.rhn.testing.RhnMockStrutsTestCase;
* @version $Rev: 1 $
*/
public class ###CLASSNAME### extends RhnMockStrutsTestCase {
-
+
public void testExecute() throws Exception {
setRequestPathInfo("###ACTIONPATH###");
actionPerform();
10 years
Changes to 'refs/tags/spacewalk-java-1.10.88-1'
by Tomas Lestach
Tag 'spacewalk-java-1.10.88-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-05-30 16:43 +0000
Tagging package [spacewalk-java] version [1.10.88-1] in directory [java/].
Changes since spacewalk-java-1.10.87-1:
Tomas Lestach (3):
855845 - escaping system name for /rhn/channel/ssm/BaseChannelSubscribe.do
855845 - escaping system name for /rhn/channel/ssm/ChildSubscriptionsConfirm.do
Automatic commit of package [spacewalk-java] release [1.10.88-1].
---
java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp | 6 ++++--
java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 4 +++-
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
---
10 years
3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp | 6 ++++--
java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp | 4 +++-
java/spacewalk-java.spec | 7 ++++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 14 insertions(+), 5 deletions(-)
New commits:
commit a84e9a0f2ae70cd9c0bcfc1e2de554d58f0a48ec
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 30 18:43:06 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.88-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7343578..e9688ba 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.87
+Version: 1.10.88
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,11 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 30 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.88-1
+- 855845 - escaping system name for
+ /rhn/channel/ssm/ChildSubscriptionsConfirm.do
+- 855845 - escaping system name for /rhn/channel/ssm/BaseChannelSubscribe.do
+
* Thu May 30 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.87-1
- 515003 - changing confirmprotected.jsp.confirmmsg.deux message
- making DataSourceParserTest work with PostgreSQL
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 87a255d..c8eda21 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.87-1 java/
+1.10.88-1 java/
commit f7149acf5809d39a09d2aec442d1c4c483910fc3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 30 18:15:13 2013 +0200
855845 - escaping system name for /rhn/channel/ssm/ChildSubscriptionsConfirm.do
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
index 305aeaf..cd987cd 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/childsubconfirm.jsp
@@ -33,7 +33,9 @@
sortable="true"
headerkey="ssmchildsubconfirm.jsp.systemName"
attr="name">
- <c:out value="<a href=\"/rhn/systems/details/Overview.do?sid=${current.id}\">${current.name}</a>" escapeXml="false" />
+ <a href="/rhn/systems/details/Overview.do?sid=${current.id}">
+ <c:out value="${current.name}" escapeXml="true" />
+ </a>
</rl:column>
<!-- Channels we're allowed to subscribe to -->
commit ac444b58d75a3cf0ffc081d0cd7cf1f6602c78d7
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 30 18:14:05 2013 +0200
855845 - escaping system name for /rhn/channel/ssm/BaseChannelSubscribe.do
diff --git a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
index 2ec03ea..d767ead 100644
--- a/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/ssm/basesub.jsp
@@ -33,10 +33,12 @@
sortattr="name"
>
<c:if test="${current.id > 0}">
- <c:out value="<a href=\"/rhn/channels/ChannelDetail.do?cid=${current.id}\">${current.name}</a>" escapeXml="false" />
+ <a href="/rhn/channels/ChannelDetail.do?cid=${current.id}">
+ <c:out value="${current.name}" escapeXml="true" />
+ </a>
</c:if>
<c:if test="${current.id <= 0}">
- <c:out value="${current.name}" escapeXml="false" />
+ <c:out value="${current.name}" escapeXml="true" />
</c:if>
</rl:column>
10 years
Changes to 'refs/tags/spacewalk-java-1.10.87-1'
by Tomas Lestach
Tag 'spacewalk-java-1.10.87-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-05-30 15:50 +0000
Tagging package [spacewalk-java] version [1.10.87-1] in directory [java/].
Changes since spacewalk-backend-1.10.42-1:
Tomas Lestach (2):
515003 - changing confirmprotected.jsp.confirmmsg.deux message
Automatic commit of package [spacewalk-java] release [1.10.87-1].
---
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 ++--
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
---
10 years
2 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 4 ++--
java/spacewalk-java.spec | 9 ++++++++-
rel-eng/packages/spacewalk-java | 2 +-
3 files changed, 11 insertions(+), 4 deletions(-)
New commits:
commit 5b722e5b7b27b879757cfff95445422ab61de265
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 30 17:50:08 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.87-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 9007672..7343578 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -28,7 +28,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.10.86
+Version: 1.10.87
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu May 30 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.87-1
+- 515003 - changing confirmprotected.jsp.confirmmsg.deux message
+- making DataSourceParserTest work with PostgreSQL
+- 516265 - sort parent channel pop-up menu by channel name
+- 514288 - removing obsolete kickstart warning
+- 512433 - grammatical typo
+
* Tue May 28 2013 Simon Lukasik <slukasik(a)redhat.com> 1.10.86-1
- SCAP file size limit shall be configurable through web interface
- Refactor: Rename variable: newLimit -> newCrashLimit
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 53f6d48..87a255d 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.86-1 java/
+1.10.87-1 java/
commit 48a377d93b9d972e62082256df2f10c3d7d3f007
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Thu May 30 17:47:26 2013 +0200
515003 - changing confirmprotected.jsp.confirmmsg.deux message
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 8e12f2e..f726f3a 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
@@ -19541,8 +19541,8 @@ given channel.</source>
</trans-unit>
<trans-unit id="confirmprotected.jsp.confirmmsg.deux">
<source>You may choose to grant the organizations below access to this
- channel, or you may deny them access. You can modify access to this
- channel at any time using the 'Organizations' tab above.
+ channel, or you may deny them access. Once the channel is protected, you can
+ modify access to this channel at any time using the 'Organizations' tab.
</source>
<context-group name="ctx">
<context context-type="sourcefile">/rhn/channels/manage/ConfirmPrivate.do</context>
10 years
Changes to 'refs/tags/spacewalk-backend-1.10.42-1'
by Michael Mraka
Tag 'spacewalk-backend-1.10.42-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-05-30 10:06 +0000
Tagging package [spacewalk-backend] version [1.10.42-1] in directory [backend/].
Changes since spacewalk-backend-1.10.41-1:
Jan Dobes (1):
making DataSourceParserTest work with PostgreSQL
Michael Mraka (2):
severity may be unknown
Automatic commit of package [spacewalk-backend] release [1.10.42-1].
Tomas Lestach (3):
512433 - grammatical typo
514288 - removing obsolete kickstart warning
516265 - sort parent channel pop-up menu by channel name
---
backend/satellite_tools/reposync.py | 2
backend/spacewalk-backend.spec | 5
java/code/src/com/redhat/rhn/common/db/datasource/test/DataSourceParserTest.java | 79 ++--
java/code/src/com/redhat/rhn/common/db/datasource/test/UserData.java | 4
java/code/src/com/redhat/rhn/common/db/datasource/xml/test_queries.xml | 181 +++++++++-
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 3
java/code/src/com/redhat/rhn/frontend/action/systems/provisioning/kickstart/SessionStatusAction.java | 11
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_bn_IN.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_de.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 6
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_es.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_fr.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_gu.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_hi.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_it.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ja.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ko.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pa.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_pt_BR.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ru.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_ta.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_CN.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_zh_TW.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_bn_IN.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_de.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 8
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_es.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_fr.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_gu.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_hi.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_it.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ja.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ko.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pa.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_pt_BR.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ru.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_ta.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_CN.xml | 7
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_zh_TW.xml | 7
java/code/webapp/WEB-INF/pages/systems/details/kickstart/session_status.jsp | 18
rel-eng/packages/spacewalk-backend | 2
41 files changed, 229 insertions(+), 300 deletions(-)
---
10 years
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/reposync.py | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit 08139a90c4f01b5d477bc23bfdd0f7a36c56520d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 30 12:06:25 2013 +0200
Automatic commit of package [spacewalk-backend] release [1.10.42-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 12aedce..042a07a 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -12,7 +12,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2
-Version: 1.10.41
+Version: 1.10.42
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu May 30 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.42-1
+- severity may be unknown
+
* Wed May 29 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.41-1
- 967850 - don't change global configuration component for reading product name
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 3e0221c..82fa452 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.41-1 backend/
+1.10.42-1 backend/
commit 1e6218c04e64d49152dd086165e13a7233a78008
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Thu May 30 10:45:54 2013 +0200
severity may be unknown
fixing
unsupported operand type(s) for +: 'NoneType' and 'str'
diff --git a/backend/satellite_tools/reposync.py b/backend/satellite_tools/reposync.py
index 8d8a7f1..6849d24 100644
--- a/backend/satellite_tools/reposync.py
+++ b/backend/satellite_tools/reposync.py
@@ -230,7 +230,7 @@ class RepoSync(object):
e['product'] = notice['release'] or 'Unknown'
e['description'] = notice['description']
e['synopsis'] = notice['title'] or notice['update_id']
- if (notice['type'] == 'security' and
+ if (notice['type'] == 'security' and notice['severity'] and
not e['synopsis'].startswith(notice['severity'] + ': ')):
e['synopsis'] = notice['severity'] + ': ' + e['synopsis']
e['topic'] = ' '
10 years