java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit b12743ba93b6548b0e8694288e591771e5d097ef
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 20 15:41:53 2012 +0200
Automatic commit of package [spacewalk-java] release [1.8.113-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index b5c01b9..9a4c570 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -23,7 +23,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.8.112
+Version: 1.8.113
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -614,6 +614,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Fri Jul 20 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.113-1
+- Make the tip to be more standard English.
+- Remove XCCDF Legend from places where it is not necessary.
+- 840567 - prevent NPE
+- 841635 - sort groups by default
+
* Thu Jul 19 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.112-1
- checkstyle fix
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 7035aaf..b059a39 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.8.112-1 java/
+1.8.113-1 java/
11 years, 9 months
2 commits - java/code
by Šimon Lukašík
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 2 +-
java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp | 2 +-
java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp | 2 +-
java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp | 2 +-
java/code/webapp/WEB-INF/pages/systems/details/audit/xccdfdetails.jsp | 2 +-
5 files changed, 5 insertions(+), 5 deletions(-)
New commits:
commit 80e9069a2c7f4576a55f5d9df40bb46b0b697c41
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jul 20 15:29:00 2012 +0200
Make the tip to be more standard English.
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 8172c4d..1366ea4 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
@@ -11931,7 +11931,7 @@ the <strong>Red Hat Enterprise Linux System Administration Guide.</stro
<source>/usr/bin/oscap xccdf eval</source>
</trans-unit>
<trans-unit id="system.audit.schedulexccdf.jsp.tooltip">
- <source>The --profile command-line argument might be required by certain versions of OpenSCAP. It determinates a particular profile from XCCDF document.</source>
+ <source>Certain versions of OpenSCAP may require the --profile command-line argument. --profile specifies a particular profile from the XCCDF document.</source>
</trans-unit>
</group>
commit fa84c444cb3a85a8d299575c8ccf59ddf0b87990
Author: Simon Lukasik <slukasik(a)redhat.com>
Date: Fri Jul 20 15:21:54 2012 +0200
Remove XCCDF Legend from places where it is not necessary.
diff --git a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
index 21c9cf5..46f28b9 100644
--- a/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/listxccdf.jsp
@@ -17,7 +17,7 @@
<bean:message key="system.audit.listscap.jsp.overview"/>
</rhn:toolbar>
-<rl:listset name="groupSet" legend="xccdf">
+<rl:listset name="groupSet">
<rhn:csrf />
<rhn:submitted />
<rl:list emptykey="audit.listxccdf.jsp.noscans">
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp
index ed2446f..173f263 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfdiffsubmit.jsp
@@ -48,7 +48,7 @@ div.differs {
</div>
-<rl:listset name="groupSet" legend="xccdf">
+<rl:listset name="groupSet">
<rhn:csrf/>
<h2><bean:message key="system.audit.xccdfdetails.jsp.header"/></h2>
diff --git a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
index 43de22c..088757c 100644
--- a/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
+++ b/java/code/webapp/WEB-INF/pages/audit/scap/xccdfsearch.jsp
@@ -115,7 +115,7 @@
<c:set var="pageList" value="${requestScope.pageList}"/>
<hr/>
- <rl:listset name="searchSet" legend="xccdf">
+ <rl:listset name="searchSet">
<rhn:csrf/>
<c:choose>
<c:when test="${param.show_as == 'tr'}">
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 23826f8..e0e5942 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
@@ -86,7 +86,7 @@
<h2><bean:message key="system.audit.xccdfdetails.jsp.xccdfrules"/></h2>
-<rl:listset name="groupSet" legend="xccdf">
+<rl:listset name="groupSet">
<rhn:csrf/>
<rl:list>
<rl:decorator name="PageSizeDecorator"/>
11 years, 9 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/domain/action/Action.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 04224910f1476297965caeba9bffa585c845e4d8
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 20 14:43:10 2012 +0200
840567 - prevent NPE
diff --git a/java/code/src/com/redhat/rhn/domain/action/Action.java b/java/code/src/com/redhat/rhn/domain/action/Action.java
index c46f82c..939d7ba 100644
--- a/java/code/src/com/redhat/rhn/domain/action/Action.java
+++ b/java/code/src/com/redhat/rhn/domain/action/Action.java
@@ -118,7 +118,7 @@ public class Action extends BaseDomainHelper implements Serializable {
* @param nameIn to set
*/
public void setName(String nameIn) {
- if (nameIn.length() > NAME_LENGTH_LIMIT) {
+ if (nameIn != null && nameIn.length() > NAME_LENGTH_LIMIT) {
this.name = nameIn.substring(0, NAME_LENGTH_LIMIT);
}
else {
11 years, 9 months
Changes to 'refs/tags/spacewalk-web-1.8.29-1'
by Tomáš Kašpárek
Tag 'spacewalk-web-1.8.29-1' created by Tomas Kasparek <tkasparek(a)redhat.com> at 2012-07-20 11:27 +0000
Tagging package [spacewalk-web] version [1.8.29-1] in directory [web/].
Changes since spacewalk-backend-1.8.50-1:
Tomas Kasparek (3):
Forcing parameter to be string
841453 - forcing parameter to be numeric
Automatic commit of package [spacewalk-web] release [1.8.29-1].
Tomas Lestach (1):
841635 - sort groups by default
---
java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 2 +-
rel-eng/packages/spacewalk-web | 2 +-
web/modules/rhn/RHN/DB/Scheduler.pm | 2 +-
web/modules/rhn/RHN/DB/Server.pm | 4 ++--
web/spacewalk-web.spec | 6 +++++-
5 files changed, 10 insertions(+), 6 deletions(-)
---
11 years, 9 months
rel-eng/packages web/spacewalk-web.spec
by Tomáš Kašpárek
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit afd7cf66ea040c956c98b62fc19a1bee5812a76c
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Fri Jul 20 13:27:19 2012 +0200
Automatic commit of package [spacewalk-web] release [1.8.29-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 2297bb1..5a20f26 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-1.8.28-1 web/
+1.8.29-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index 540845a..757469e 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.8.28
+Version: 1.8.29
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk/
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -253,6 +253,10 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Fri Jul 20 2012 Tomas Kasparek <tkasparek(a)redhat.com> 1.8.29-1
+- 841453 - forcing parameter to be numeric
+- Forcing parameter to be string
+
* Fri Jul 13 2012 Jan Pazdziora 1.8.28-1
- OpenSCAP Integration -- XCCDF Scan Diff
11 years, 9 months
web/modules
by Tomáš Kašpárek
web/modules/rhn/RHN/DB/Server.pm | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
New commits:
commit 3379c0ba58589ecb7b480a1e1672807d0bfaa0cc
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Fri Jul 20 13:13:04 2012 +0200
841453 - forcing parameter to be numeric
[error] Execution of /var/www/html/network/systems/details/history/snapshots/rollback.pxt failed at Wed Jul 18 18:12:52 2012: RHN::Exception: DBD::Pg::st execute failed: ERROR: syntax error at or near "SCC"
LINE 1: INSERT INTO rhnServerConfigChannel SCC
^
RHN::DB /usr/share/perl5/vendor_perl/RHN/DB.pm 121 RHN::Exception::DB::throw
RHN::DB::st /usr/share/perl5/vendor_perl/RHN/DB.pm 452 RHN::DB::handle_error
RHN::DB::Server /usr/share/perl5/vendor_perl/RHN/DB/Server.pm 2016 RHN::DB::st::execute_h
RHN::DB::SystemSnapshot /usr/share/perl5/vendor_perl/RHN/DB/SystemSnapshot.pm 424 RHN::DB::Server::set_normal_config_channels
RHN::DB::SystemSnapshot /usr/share/perl5/vendor_perl/RHN/DB/SystemSnapshot.pm 352 (eval)
Sniglets::Snapshot /usr/share/perl5/vendor_perl/Sniglets/Snapshot.pm 301 RHN::DB::SystemSnapshot::rollback_to_snapshot
Sniglets::Snapshot /usr/share/perl5/vendor_perl/Sniglets/Snapshot.pm 300 (eval)
PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm 482 Sniglets::Snapshot::system_snapshot_rollback_cb
PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm 103 PXT::ApacheHandler::pxt_parse_data
PXT::ApacheHandler /usr/share/perl5/vendor_perl/PXT/ApacheHandler.pm 103 (eval)
main -e 0 PXT::ApacheHandler::handler\n main -e 0 (eval)
diff --git a/web/modules/rhn/RHN/DB/Server.pm b/web/modules/rhn/RHN/DB/Server.pm
index 235c483..3b73400 100644
--- a/web/modules/rhn/RHN/DB/Server.pm
+++ b/web/modules/rhn/RHN/DB/Server.pm
@@ -2005,9 +2005,9 @@ EOS
}
$sth = $dbh->prepare(<<EOS);
-INSERT INTO rhnServerConfigChannel SCC
+INSERT INTO rhnServerConfigChannel
(server_id, config_channel_id, position)
-SELECT DISTINCT S.id, :ccid, :pos
+SELECT DISTINCT S.id, :ccid + 0, :pos + 0
FROM rhnServer S
WHERE S.id = :sid
AND EXISTS (
11 years, 9 months
java/code
by Tomas Lestach
java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit 0197f80a98fc6c071ebe69cbd9e1ecbe0a8b930e
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Jul 20 09:44:25 2012 +0200
841635 - sort groups by default
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
index db201b7..0ef0c9c 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/systems/groups.jspf
@@ -53,7 +53,7 @@
<rl:column sortable="true"
bound="false"
headerkey="grouplist.jsp.name"
- sortattr="name" filterattr="name" styleclass="${nameStyle}">
+ sortattr="name" defaultsort="asc" filterattr="name" styleclass="${nameStyle}">
<a href="/network/systems/groups/details.pxt?sgid=${current.id}">${current.name}</a>
</rl:column>
</rl:list>
11 years, 9 months
web/modules
by Tomáš Kašpárek
web/modules/rhn/RHN/DB/Scheduler.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit a10f88192e6564a594087ca1fc182779e0da9612
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Fri Jul 20 09:54:35 2012 +0200
Forcing parameter to be string
ERROR: inconsistent types deduced for parameter $1
LINE 4: ($1, 'delta-' || $1)
^
DETAIL: text versus numeric
diff --git a/web/modules/rhn/RHN/DB/Scheduler.pm b/web/modules/rhn/RHN/DB/Scheduler.pm
index 10fbed1..916c901 100644
--- a/web/modules/rhn/RHN/DB/Scheduler.pm
+++ b/web/modules/rhn/RHN/DB/Scheduler.pm
@@ -1250,7 +1250,7 @@ EOS
INSERT INTO rhnPackageDelta
(id, label)
VALUES
- (:id, 'delta-' || :id)
+ (cast(:id as numeric), 'delta-' || :id)
EOS
$sth->execute_h(id => $delta_id);
11 years, 9 months
Changes to 'refs/tags/spacewalk-backend-1.8.50-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.8.50-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2012-07-19 15:20 +0000
Tagging package [spacewalk-backend] version [1.8.50-1] in directory [backend/].
Changes since spacewalk-java-1.8.112-1:
Jan Pazdziora (2):
Add abrt into list of packaged modules.
Automatic commit of package [spacewalk-backend] release [1.8.50-1].
---
backend/server/handlers/xmlrpc/Makefile | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
---
11 years, 9 months
2 commits - backend/server backend/spacewalk-backend.spec rel-eng/packages
by Jan Pazdziora
backend/server/handlers/xmlrpc/Makefile | 2 +-
backend/spacewalk-backend.spec | 5 ++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 6 insertions(+), 3 deletions(-)
New commits:
commit f19feb4aac16f6a8591d2b402324b779e26314ff
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 19 17:20:57 2012 +0200
Automatic commit of package [spacewalk-backend] release [1.8.50-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 4c748bc..447b1c3 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.8.49
+Version: 1.8.50
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -646,6 +646,9 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Thu Jul 19 2012 Jan Pazdziora 1.8.50-1
+- Add abrt into list of packaged modules.
+
* Wed Jul 18 2012 Jan Pazdziora 1.8.49-1
- Add abrt data handling functionality
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 86e3988..2053b48 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.8.49-1 backend/
+1.8.50-1 backend/
commit 7659dfae0ff31af9d2294375049ed90909455744
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Thu Jul 19 17:09:57 2012 +0200
Add abrt into list of packaged modules.
diff --git a/backend/server/handlers/xmlrpc/Makefile b/backend/server/handlers/xmlrpc/Makefile
index dd7283e..1b29cf2 100644
--- a/backend/server/handlers/xmlrpc/Makefile
+++ b/backend/server/handlers/xmlrpc/Makefile
@@ -6,7 +6,7 @@ TOP = ../../..
SUBDIR = server/handlers/xmlrpc
FILES = __init__ country queue registration states up2date errata \
- getMethod proxy get_handler
+ getMethod proxy get_handler abrt
include $(TOP)/Makefile.defs
11 years, 9 months