reporting/spacewalk-report reporting/spacewalk-report.sgml
by Tomáš Kašpárek
reporting/spacewalk-report | 28 ++++++++++++++++++++++------
reporting/spacewalk-report.sgml | 13 +++++++++++++
2 files changed, 35 insertions(+), 6 deletions(-)
New commits:
commit 90effb434a28b6d1affe09378fb911fc00209747
Author: Tomas Kasparek <tkasparek(a)redhat.com>
Date: Mon Jun 24 16:34:06 2013 +0200
972759 - add support for sql like predicates into spacewalk-report
diff --git a/reporting/spacewalk-report b/reporting/spacewalk-report
index c22bbc9..d486756 100755
--- a/reporting/spacewalk-report
+++ b/reporting/spacewalk-report
@@ -62,6 +62,9 @@ def processCommandline():
Option('--where-<column-id>', action='store', metavar='VALUE',
dest='_where_trap',
help='limit the output to records where column-id has value VALUE'),
+ Option('--like<column-id>', action='store', metavar='VALUE',
+ dest='_like_trap',
+ help='limit the output to records where column-id has value like VALUE (string only)'),
]
optionParser = OptionParser( \
@@ -69,10 +72,17 @@ def processCommandline():
option_list=optionsTable)
where = {}
+ where_like = []
+ like = False
i = 1
while i < len(sys.argv):
- if sys.argv[i].startswith('--where-'):
- o = sys.argv[i][len('--where-'):]
+ if sys.argv[i].startswith('--where-') or sys.argv[i].startswith('--like-'):
+ if sys.argv[i].startswith('--where-'):
+ o = sys.argv[i][len('--where-'):]
+ like = False
+ elif sys.argv[i].startswith('--like-'):
+ o = sys.argv[i][len('--like-'):]
+ like = True
try:
(k, v) = o.split('=', 1)
del sys.argv[i]
@@ -96,6 +106,8 @@ def processCommandline():
where[k].append(v)
else:
where[k] = [ v ]
+ if like:
+ where_like.append(k)
i += 1
@@ -103,10 +115,10 @@ def processCommandline():
sys.argv[1:] = args
- return options, where
+ return options, where, where_like
if __name__ == '__main__':
- (options, where) = processCommandline()
+ (options, where, where_like) = processCommandline()
try:
if len(sys.argv) > 2:
@@ -164,10 +176,14 @@ if __name__ == '__main__':
the_dict_where["p%d" % pi] = x
pi += 1
+ if k in where_like:
+ clause = 'like'
+ else:
+ clause = 'in'
if k == 'group':
- the_sql_where.append('"%s" in ( %s )' % (k.upper(), val))
+ the_sql_where.append('"%s" %s ( %s )' % (k.upper(), clause, preval))
else:
- the_sql_where.append('%s in ( %s )' % (k, val))
+ the_sql_where.append('%s %s ( %s )' % (k, clause, val))
rhnSQL.initDB()
diff --git a/reporting/spacewalk-report.sgml b/reporting/spacewalk-report.sgml
index 7244efa..418255b 100644
--- a/reporting/spacewalk-report.sgml
+++ b/reporting/spacewalk-report.sgml
@@ -107,6 +107,19 @@ Generate reports from Spacewalk server in csv format
have to meet the condition.</para>
</listitem>
</varlistentry>
+ <varlistentry>
+ <term>--like-<replaceable>column-id</replaceable>=<replaceable>VALUE</replaceable></term>
+ <listitem>
+ <para>Limit the output to records where column-id has value
+ like VALUE. This applies for string values only. It can be used
+ multiple times -- for the same column it will select records
+ where the column has any of the VALUEs. When different columns
+ are specified, all of them have to meet the condition. Regular
+ expressions for like clause are described by SQL standard. Most
+ common wildcards are _ for any single character and % for multiple
+ occurances of any character.</para>
+ </listitem>
+ </varlistentry>
</variablelist>
</RefSect1>
10 years, 10 months
spacewalk/spacewalk-setup-postgresql
by Milan Zazrivec
spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql | 55 +++++-----
1 file changed, 28 insertions(+), 27 deletions(-)
New commits:
commit 2d884c6d8892b04eecc323c8dd9534967122660e
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Jun 24 15:46:02 2013 +0200
re-configure postgresql when re-running the setup utility
diff --git a/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql b/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
index dcb8309..1a99064 100755
--- a/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
+++ b/spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql
@@ -117,14 +117,15 @@ create() {
if [ ! -d "$PG_DATA/base" ] ; then
postgresql_service initdb
+ fi
- if $STANDALONE; then
- sed -i 's/^\(\s*listen_addresses.*|\s*port.*\)$/### next line has been commented out by spacewalk-setup-postgresql ###\n##\1/' $POSTGRESQL
- fi
+ if $STANDALONE; then
+ sed -i 's/^\(\s*listen_addresses.*\|\s*port.*\)$/### next line has been commented out by spacewalk-setup-postgresql ###\n##\1/' $POSTGRESQL
+ fi
- # see bug 821446, we enable timestamps in logs by default
- sed -i 's/^\(\s*max_connections.*\|\s*shared_buffers.*\)$/### next line has been commented out by spacewalk-setup-postgresql ###\n##\1/' $POSTGRESQL
- cat >> $POSTGRESQL <<EOF
+ # see bug 821446, we enable timestamps in logs by default
+ sed -i 's/^\(\s*max_connections.*\|\s*shared_buffers.*\)$/### next line has been commented out by spacewalk-setup-postgresql ###\n##\1/' $POSTGRESQL
+ cat >> $POSTGRESQL <<EOF
### spacewalk-setup-postgresql modified values
checkpoint_completion_target = 0.7
@@ -138,19 +139,19 @@ wal_buffers = 4MB
work_mem = 2560kB
EOF
- if $STANDALONE; then
- echo "$ADDRESS"|grep -q '127.0.0.1\|*' || ADDRESS="$ADDRESS, 127.0.0.1"
- cat >> $POSTGRESQL <<EOF
+ if $STANDALONE; then
+ echo "$ADDRESS"|grep -q '127.0.0.1\|*' || ADDRESS="$ADDRESS, 127.0.0.1"
+ cat >> $POSTGRESQL <<EOF
### spacewalk-setup-postgresql modified values for a standalone PostgreSQL database
listen_addresses='$ADDRESS'
port=$PORT
EOF
- fi
+ fi
- sysctl kernel.shmmax | ( read v v v ; LIMIT=500000000 ; if [ "0$v" -lt $LIMIT ] ; then sysctl "kernel.shmmax=$LIMIT" >> /etc/sysctl.conf ; fi )
+ sysctl kernel.shmmax | ( read v v v ; LIMIT=500000000 ; if [ "0$v" -lt $LIMIT ] ; then sysctl "kernel.shmmax=$LIMIT" >> /etc/sysctl.conf ; fi )
- sed -i 's/^\([^#].*\)$/### next line has been commented out by spacewalk-setup-postgresql: ###\n##\1/ ' $PG_HBA
- cat >> $PG_HBA <<EOF
+ sed -i 's/^\([^#].*\)$/### next line has been commented out by spacewalk-setup-postgresql: ###\n##\1/ ' $PG_HBA
+ cat >> $PG_HBA <<EOF
local $PGNAME $PGUSER md5
host $PGNAME $PGUSER 127.0.0.1/8 md5
@@ -160,22 +161,22 @@ local postgres postgres ident
EOF
- if $STANDALONE; then
- for ADDR in $(echo $REMOTE|sed 's/,/ /g' ); do
- cat >> $PG_HBA <<EOF
+ if $STANDALONE; then
+ for ADDR in $(echo $REMOTE|sed 's/,/ /g' ); do
+ cat >> $PG_HBA <<EOF
host $PGNAME $PGUSER $ADDR md5
EOF
- done
+ done
- # Create & configure /etc/rhn/rhn.conf
- RHN_CONF_DIR=$(dirname $RHN_CONF)
- if [ -d $RHN_CONF_DIR ]; then
- chmod 0710 $RHN_CONF_DIR
- else
- mkdir -m 0710 $RHN_CONF_DIR
- fi
+ # Create & configure /etc/rhn/rhn.conf
+ RHN_CONF_DIR=$(dirname $RHN_CONF)
+ if [ -d $RHN_CONF_DIR ]; then
+ chmod 0710 $RHN_CONF_DIR
+ else
+ mkdir -m 0710 $RHN_CONF_DIR
+ fi
- cat > $RHN_CONF <<EOF
+ cat > $RHN_CONF <<EOF
db_backend = postgresql
db_user = $PGUSER
db_password = $PGPASSWORD
@@ -183,11 +184,11 @@ db_name = $PGNAME
db_host = localhost
db_port = $PORT
EOF
- chmod 640 $RHN_CONF
+ chmod 640 $RHN_CONF
- fi
fi
+ postgresql_service status >& /dev/null && postgresql_service stop
postgresql_service start
if /usr/sbin/lsof /proc > /dev/null ; then
10 years, 10 months
Changes to 'refs/tags/spacewalk-java-1.10.102-1'
by Tomas Lestach
Tag 'spacewalk-java-1.10.102-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2013-06-24 12:24 +0000
Tagging package [spacewalk-java] version [1.10.102-1] in directory [java/].
Changes since spacewalk-schema-1.10.49-1:
Tomas Lestach (6):
855845 - escaping system name on inactive-systems yourrhn pane
855845 - escaping system name for /rhn/configuration/channel/TargetSystems.do
855845 - escaping system name for /rhn/systems/details/configuration/DeployFileConfirm.do
855845 - escaping system name for /rhn/systems/details/packages/profiles/CompareSystems.do
855845 - escaping system name for message.syncpackages message
Automatic commit of package [spacewalk-java] release [1.10.102-1].
---
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java | 15 ++++++----
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java | 7 +++-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java | 7 +++-
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp | 3 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp | 6 ++--
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp | 13 ++++----
java/spacewalk-java.spec | 12 +++++++-
rel-eng/packages/spacewalk-java | 2 -
9 files changed, 44 insertions(+), 23 deletions(-)
---
10 years, 10 months
6 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java | 15 ++++++----
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java | 7 +++-
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java | 7 +++-
java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp | 2 -
java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp | 3 +-
java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp | 6 ++--
java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp | 13 ++++----
java/spacewalk-java.spec | 12 +++++++-
rel-eng/packages/spacewalk-java | 2 -
9 files changed, 44 insertions(+), 23 deletions(-)
New commits:
commit 9a0e59f632da66a44d0e50f92850c0c3e739dc93
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 14:24:00 2013 +0200
Automatic commit of package [spacewalk-java] release [1.10.102-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 3d92bfe..6129b52 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.101
+Version: 1.10.102
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -751,6 +751,16 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Jun 24 2013 Tomas Lestach <tlestach(a)redhat.com> 1.10.102-1
+- 855845 - escaping system name for message.syncpackages message
+- 855845 - escaping system name for
+ /rhn/systems/details/packages/profiles/CompareSystems.do
+- 855845 - escaping system name for
+ /rhn/systems/details/configuration/DeployFileConfirm.do
+- 855845 - escaping system name for /rhn/configuration/channel/TargetSystems.do
+- 855845 - escaping system name on inactive-systems yourrhn pane
+- fix (virt) system icons on system group pages
+
* Thu Jun 20 2013 Tomas Kasparek <tkasparek(a)redhat.com> 1.10.101-1
- Fix syntax. Sentences start with capital letter.
- 975083 - typo fix
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index bac4d35..e59b546 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.101-1 java/
+1.10.102-1 java/
commit c7632a642155dca0ebd52cf5877de7299b03f3e3
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 13:57:44 2013 +0200
855845 - escaping system name for message.syncpackages message
You have successfully scheduled a package profile sync for <> from <>.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
index 88be04e..9e6fa34 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/MissingPackageAction.java
@@ -15,6 +15,7 @@
package com.redhat.rhn.frontend.action.rhnpackage.profile;
import com.redhat.rhn.common.db.datasource.DataResult;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.rhnpackage.PackageAction;
import com.redhat.rhn.domain.user.User;
import com.redhat.rhn.frontend.struts.RequestContext;
@@ -77,9 +78,10 @@ public class MissingPackageAction extends BaseProfilesAction {
List args = new ArrayList();
args.add(sid.toString());
args.add(pa.getId().toString());
- args.add(requestContext.lookupAndBindServer().getName());
- args.add(ProfileManager.lookupByIdAndOrg(prid,
- requestContext.getCurrentUser().getOrg()).getName());
+ args.add(StringUtil.htmlifyText(
+ requestContext.lookupAndBindServer().getName()));
+ args.add(StringUtil.htmlifyText(ProfileManager.lookupByIdAndOrg(prid,
+ requestContext.getCurrentUser().getOrg()).getName()));
createMessage(requestContext.getRequest(), "message.syncpackages", args);
}
@@ -96,9 +98,10 @@ public class MissingPackageAction extends BaseProfilesAction {
List args = new ArrayList();
args.add(sid.toString());
args.add(pa.getId().toString());
- args.add(requestContext.lookupAndBindServer().getName());
- args.add(SystemManager.lookupByIdAndUser(sid1,
- requestContext.getCurrentUser()).getName());
+ args.add(StringUtil.htmlifyText(
+ requestContext.lookupAndBindServer().getName()));
+ args.add(StringUtil.htmlifyText(SystemManager.lookupByIdAndUser(sid1,
+ requestContext.getCurrentUser()).getName()));
createMessage(requestContext.getRequest(), "message.syncpackages", args);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java
index 255c3ef..32f9430 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncProfilesAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.rhnpackage.profile;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.rhnpackage.PackageAction;
import com.redhat.rhn.domain.rhnpackage.MissingPackagesException;
import com.redhat.rhn.domain.user.User;
@@ -85,8 +86,10 @@ public class SyncProfilesAction extends BaseProfilesAction {
List args = new ArrayList();
args.add(sid.toString());
args.add(pa.getId().toString());
- args.add(requestContext.lookupAndBindServer().getName());
- args.add(ProfileManager.lookupByIdAndOrg(prid, user.getOrg()).getName());
+ args.add(StringUtil.htmlifyText(
+ requestContext.lookupAndBindServer().getName()));
+ args.add(StringUtil.htmlifyText(
+ ProfileManager.lookupByIdAndOrg(prid, user.getOrg()).getName()));
createMessage(request, "message.syncpackages", args);
}
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java
index bbee874..739236c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/profile/SyncSystemsProfilesAction.java
@@ -14,6 +14,7 @@
*/
package com.redhat.rhn.frontend.action.rhnpackage.profile;
+import com.redhat.rhn.common.util.StringUtil;
import com.redhat.rhn.domain.action.rhnpackage.PackageAction;
import com.redhat.rhn.domain.rhnpackage.MissingPackagesException;
import com.redhat.rhn.domain.user.User;
@@ -85,8 +86,10 @@ public class SyncSystemsProfilesAction extends BaseProfilesAction {
List args = new ArrayList();
args.add(sid.toString());
args.add(pa.getId().toString());
- args.add(requestContext.lookupAndBindServer().getName());
- args.add(SystemManager.lookupByIdAndUser(sid1, user).getName());
+ args.add(StringUtil.htmlifyText(
+ requestContext.lookupAndBindServer().getName()));
+ args.add(StringUtil.htmlifyText(
+ SystemManager.lookupByIdAndUser(sid1, user).getName()));
createMessage(request, "message.syncpackages", args);
}
commit f99503d81dc268d9c2e54e6184999a462bed8618
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 12:00:33 2013 +0200
855845 - escaping system name for /rhn/systems/details/packages/profiles/CompareSystems.do
diff --git a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
index f6f7aa5..b9777a8 100644
--- a/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/details/packages/profiles/comparesystems.jsp
@@ -1,5 +1,6 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ 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" %>
@@ -11,7 +12,7 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<h2><img src="/img/rhn-icon-packages.gif" />
- <bean:message key="compare.jsp.compareto" arg0="${requestScope.systemname}" />
+ <bean:message key="compare.jsp.compareto" arg0="${fn:escapeXml(requestScope.systemname)}" />
</h2>
<div class="page-summary">
@@ -32,7 +33,7 @@
disabled="${not current.selectable}"/>
<rl:column headerkey="compare.jsp.package" bound="false" filterattr="name">
- ${current.name}
+ <c:out value="${current.name}" escapeXml="true" />
</rl:column>
<rl:column headerkey="packagelist.jsp.packagearch" bound="false">
@@ -43,12 +44,12 @@
${current.system.evr}
</rl:column>
- <rl:column headertext="${requestScope.systemname}" bound="false">
+ <rl:column headertext="${fn:escapeXml(requestScope.systemname)}" bound="false">
${current.other.evr}
</rl:column>
<rl:column headerkey="compare.jsp.difference" bound="false">
- ${current.comparison}
+ <c:out value="${current.comparison}" escapeXml="true" />
</rl:column>
</rl:list>
@@ -59,7 +60,7 @@
<rhn:submitted/>
<hr />
<html:submit property="dispatch">
- <bean:message key="compare.jsp.syncpackageto" arg0="${requestScope.systemname}"/>
+ <bean:message key="compare.jsp.syncpackageto" arg0="${fn:escapeXml(requestScope.systemname)}"/>
</html:submit>
</div>
</rhn:require>
@@ -68,7 +69,7 @@
<div align="left">
<hr />
<strong><bean:message key="compare.jsp.noprovisioning"
- arg0="${system.name}" arg1="${param.sid}"/></strong>
+ arg0="${fn:escapeXml(system.name)}" arg1="${param.sid}"/></strong>
</div>
</rhn:require>
</c:if>
commit 42607fd44bf09116663bc8530096f61740c53658
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 11:47:08 2013 +0200
855845 - escaping system name for /rhn/systems/details/configuration/DeployFileConfirm.do
diff --git a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
index d723ff6..9690d68 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/sdc/deployfileconfirm.jsp
@@ -1,5 +1,6 @@
<%@ taglib uri="http://rhn.redhat.com/rhn" prefix="rhn" %>
<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/functions" prefix="fn" %>
<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
<%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
@@ -12,14 +13,13 @@
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<rhn:toolbar base="h2" img="/img/rhn-icon-system.gif" >
- <bean:message key="sdcdeployconfirm.jsp.header"
- arg0="${system.name}"/>
+ <bean:message key="sdcdeployconfirm.jsp.header"/>
</rhn:toolbar>
<div class="page-summary">
<p>
<bean:message key="sdcdeployconfirm.jsp.summary"
- arg0="${system.name}"/>
+ arg0="${fn:escapeXml(system.name)}"/>
</p>
</div>
commit 33636b499e226e2a12d50e7ac0318f8a41142509
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 11:34:42 2013 +0200
855845 - escaping system name for /rhn/configuration/channel/TargetSystems.do
diff --git a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
index bfef8c1..29eda33 100644
--- a/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/configuration/channel/targetsystems.jsp
@@ -34,7 +34,8 @@
<rhn:set value="${current.id}"/>
<rhn:column header="system.common.systemName"
url="/rhn/systems/details/Overview.do?sid=${current.id}">
- <img alt="" src="/img/rhn-listicon-system.gif" /> ${current.name}
+ <img alt="" src="/img/rhn-listicon-system.gif" />
+ <c:out value="${current.name}" escapeXml="true" />
</rhn:column>
</rhn:listdisplay>
</rhn:list>
commit c32bf7fd2ad83fa88245d74ed8e464d018a15c01
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 11:29:30 2013 +0200
855845 - escaping system name on inactive-systems yourrhn pane
diff --git a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
index 6017871..2f3a07b 100644
--- a/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
+++ b/java/code/webapp/WEB-INF/pages/common/fragments/yourrhn/inactiveSystems.jsp
@@ -18,7 +18,7 @@
<rhn:column header="inactivelist.jsp.header"
url="/rhn/systems/details/Overview.do?sid=${current.id}">
<img src="/img/icon_checkin.gif" alt="<bean:message key="system-legend.jsp.notcheckingin"/>" />
- ${current.name}
+ <c:out value="${current.name}" escapeXml="true" />
</rhn:column>
<rhn:column header="emptyspace.jsp">
10 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.10.49-1'
by Michael Mraka
Tag 'spacewalk-schema-1.10.49-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-06-24 11:39 +0000
Tagging package [spacewalk-schema] version [1.10.49-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.10.48-1:
Michael Mraka (2):
fixed syntax error in rhn_confrevision_del_trig_fun
Automatic commit of package [spacewalk-schema] release [1.10.49-1].
Tomas Lestach (1):
fix (virt) system icons on system group pages
---
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 4 ++++
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/postgres/triggers/rhnConfigRevision.sql | 6 +++---
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
4 files changed, 12 insertions(+), 5 deletions(-)
---
10 years, 10 months
2 commits - rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/postgres/triggers/rhnConfigRevision.sql | 6 +++---
schema/spacewalk/spacewalk-schema.spec | 5 ++++-
3 files changed, 8 insertions(+), 5 deletions(-)
New commits:
commit c7f01aaddbe5ec8e4f776dcc8c193aa61e2f3bd9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jun 24 13:39:37 2013 +0200
Automatic commit of package [spacewalk-schema] release [1.10.49-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index a1a0389..090d811 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.48-1 schema/spacewalk/
+1.10.49-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index 66522df..5f94d21 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.48
+Version: 1.10.49
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,6 +71,9 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Mon Jun 24 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.49-1
+- fixed syntax error in rhn_confrevision_del_trig_fun
+
* Fri Jun 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.48-1
- 906157 - upgrade scripts for rhn_config.delete_file() and
rhn_confrevision_ccid_idx index
commit 9e79f808d1d1be673097d516de7aeff7b1be251d
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Jun 24 13:33:36 2013 +0200
fixed syntax error in rhn_confrevision_del_trig_fun
diff --git a/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql b/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql
index aeb59cb..503a74c 100644
--- a/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql
+++ b/schema/spacewalk/postgres/triggers/rhnConfigRevision.sql
@@ -43,12 +43,12 @@ begin
set invalid = cr_removed
where id in (select snapshot_id
from rhnSnapshotConfigRevision
- where config_revision_id = :old.id);
+ where config_revision_id = old.id);
delete from rhnSnapshotConfigRevision
- where config_revision_id = old.id;
+ where config_revision_id = old.id
and snapshot_id in (select snapshot_id
from rhnSnapshotConfigRevision
- where config_revision_id = :old.id);
+ where config_revision_id = old.id);
return old;
end;
$$ language plpgsql;
10 years, 10 months
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 4 ++++
1 file changed, 4 insertions(+)
New commits:
commit 461a7d071f781768c108e1a48c40d5b735391fd6
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Jun 24 11:06:14 2013 +0200
fix (virt) system icons on system group pages
* /rhn/groups/ListRemoveSystems.do
* /rhn/groups/AddSystems.do pages
diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
index 99adb45..44f9edc 100644
--- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
+++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml
@@ -345,6 +345,8 @@ ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
<elaborator name="entitlements"/>
+ <elaborator name="is_virtual_guest" />
+ <elaborator name="is_virtual_host" />
<elaborator name="system_config_files_with_diffs" />
</mode>
@@ -363,6 +365,8 @@ ORDER BY UPPER(COALESCE(S.NAME, '(none)')), S.ID
</query>
<elaborator name="system_overview" />
<elaborator name="entitlements"/>
+ <elaborator name="is_virtual_guest" />
+ <elaborator name="is_virtual_host" />
<elaborator name="system_config_files_with_diffs" />
</mode>
10 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.10.48-1'
by Michael Mraka
Tag 'spacewalk-schema-1.10.48-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-06-21 15:07 +0000
Tagging package [spacewalk-schema] version [1.10.48-1] in directory [schema/spacewalk/].
Changes since spacewalk-schema-1.10.47-1:
Michael Mraka (2):
fixed oracle file checksum
Automatic commit of package [spacewalk-schema] release [1.10.48-1].
---
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 4 ++--
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/020-rhnConfigRevision-index.sql.postgresql | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
---
10 years, 10 months
2 commits - rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 4 ++--
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/020-rhnConfigRevision-index.sql.postgresql | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
New commits:
commit d67baa514755804f9d94514f962cb5971a5ceded
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 21 17:07:27 2013 +0200
Automatic commit of package [spacewalk-schema] release [1.10.48-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index a38ed2b..a1a0389 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.10.47-1 schema/spacewalk/
+1.10.48-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index b68063b..66522df 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.47
+Version: 1.10.48
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -71,7 +71,7 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
-* Fri Jun 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.47-1
+* Fri Jun 21 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.48-1
- 906157 - upgrade scripts for rhn_config.delete_file() and
rhn_confrevision_ccid_idx index
- 906157 - index columns by which we select
commit e6e0abebc49f01d72f152801b60286f4986570d3
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Jun 21 17:06:54 2013 +0200
fixed oracle file checksum
diff --git a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/020-rhnConfigRevision-index.sql.postgresql b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/020-rhnConfigRevision-index.sql.postgresql
index da10970..632c553 100644
--- a/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/020-rhnConfigRevision-index.sql.postgresql
+++ b/schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/020-rhnConfigRevision-index.sql.postgresql
@@ -1,3 +1,3 @@
--- oracle equivalent source sha1 5382865750405facc547315329a739b8ee1fe238
+-- oracle equivalent source sha1 55bd9a4e61293938b94e9bcee6492d4e85b760e4
create index rhn_confrevision_ccid_idx on rhnConfigRevision (config_content_id);
10 years, 10 months
Changes to 'refs/tags/spacewalk-schema-1.10.47-1'
by Michael Mraka
Tag 'spacewalk-schema-1.10.47-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-06-21 14:30 +0000
Tagging package [spacewalk-schema] version [1.10.47-1] in directory [schema/spacewalk/].
Changes since spacewalk-setup-1.10.15-1:
Michael Mraka (6):
removed unused variable oid and org_id
906157 - replace number of small updates/deletes in loop by a global update/delete
906157 - removed duplicate update
906157 - index columns by which we select
906157 - upgrade scripts for rhn_config.delete_file() and rhn_confrevision_ccid_idx index
Automatic commit of package [spacewalk-schema] release [1.10.47-1].
Milan Zazrivec (2):
use for cycle instead of map
discard error output from createuser
---
rel-eng/packages/spacewalk-schema | 2
schema/spacewalk/common/tables/rhnConfigRevision.sql | 4
schema/spacewalk/oracle/packages/rhn_config.pkb | 51 --
schema/spacewalk/oracle/triggers/rhnConfigRevision.sql | 22
schema/spacewalk/postgres/packages/rhn_config.pkb | 52 --
schema/spacewalk/postgres/triggers/rhnConfigRevision.sql | 28 -
schema/spacewalk/spacewalk-schema.spec | 9
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/020-rhnConfigRevision-index.sql.oracle | 11
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/020-rhnConfigRevision-index.sql.postgresql | 3
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/021-rhn_config.pkb.sql.oracle | 248 ++++++++++
schema/spacewalk/upgrade/spacewalk-schema-1.9-to-spacewalk-schema-1.10/021-rhn_config.pkb.sql.postgresql | 235 +++++++++
spacewalk/setup/lib/Spacewalk/Setup.pm | 5
spacewalk/spacewalk-setup-postgresql/bin/spacewalk-setup-postgresql | 2
13 files changed, 561 insertions(+), 111 deletions(-)
---
10 years, 10 months