web/modules
by Jan Pazdziora
web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit b8beca90886ca2e4202fb51e57900d91dc592c67
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Apr 4 20:13:53 2011 +0200
Fixing PostgreSQL distinct/order by issue in tags_for_provisioning_entitled_in_set.
Addressing
DBD::Pg::st execute failed: ERROR: for SELECT DISTINCT, ORDER BY expressions must appear in select list
LINE 27: ORDER BY UPPER(TN.name)
^
diff --git a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
index 73657af..24214c7 100644
--- a/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
+++ b/web/modules/rhn/RHN/DB/DataSource/xml/General_queries.xml
@@ -19,6 +19,7 @@ ORDER BY UPPER(TN.name)
<mode name="tags_for_provisioning_entitled_in_set">
<query params="user_id">
+select * from (
SELECT DISTINCT T.id AS ID,
TN.name,
TO_CHAR(T.created, 'YYYY-MM-DD HH24:MI:SS') AS DATE_TAG_CREATED,
@@ -44,7 +45,8 @@ SELECT DISTINCT T.id AS ID,
AND STag.tag_id = T.id
AND T.name_id = TN.id
GROUP BY T.id, TN.name, T.created
-ORDER BY UPPER(TN.name)
+) S
+ORDER BY UPPER(name)
</query>
</mode>
13 years, 1 month
backend/satellite_tools
by Michael Mraka
backend/satellite_tools/spacewalk-update-signatures | 1 +
1 file changed, 1 insertion(+)
New commits:
commit bd7b16002db485df20977c64d48d08f749875762
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Apr 4 16:52:09 2011 +0200
don't try to update signatures for non-rpm packages
diff --git a/backend/satellite_tools/spacewalk-update-signatures b/backend/satellite_tools/spacewalk-update-signatures
index d47a9bf..d84675e 100644
--- a/backend/satellite_tools/spacewalk-update-signatures
+++ b/backend/satellite_tools/spacewalk-update-signatures
@@ -81,6 +81,7 @@ _get_needed_pkgs_query = """
rhnPackageKeyAssociation PA on PA.package_id = P.id inner join
rhnChecksumView CV on CV.id = P.checksum_id
where PA.key_id is null
+ and P.rpm_version is not null
"""
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.4.28-1'
by Miroslav Suchý
Tag 'spacewalk-java-1.4.28-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-04-04 14:45 +0000
Tagging package [spacewalk-java] version [1.4.28-1] in directory [java/].
Changes since spacewalk-java-1.4.27-1:
Miroslav Suchý (3):
683200 - IDN.toUnicode does not allow null value
when hostname is unknown print "unknown"
Automatic commit of package [spacewalk-java] release [1.4.28-1].
---
java/code/src/com/redhat/rhn/domain/server/Server.java | 3 ++-
java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp | 9 ++++++++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 16 insertions(+), 4 deletions(-)
---
13 years, 1 month
3 commits - java/code java/spacewalk-java.spec rel-eng/packages
by Miroslav Suchý
java/code/src/com/redhat/rhn/domain/server/Server.java | 3 ++-
java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp | 9 ++++++++-
java/spacewalk-java.spec | 6 +++++-
rel-eng/packages/spacewalk-java | 2 +-
4 files changed, 16 insertions(+), 4 deletions(-)
New commits:
commit 721d0ebaef5947f1ceb68c27bafd033a3fe6ccd6
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 4 16:45:56 2011 +0200
Automatic commit of package [spacewalk-java] release [1.4.28-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 1db279e..0b334b6 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.4.27
+Version: 1.4.28
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -532,6 +532,10 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Apr 04 2011 Miroslav Suchý 1.4.28-1
+- when hostname is unknown print "unknown"
+- 683200 - IDN.toUnicode does not allow null value
+
* Mon Apr 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.27-1
- fixed queries on Virtual system Overview page
- correct form property
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index bfe0fdc..e6977a6 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.4.27-1 java/
+1.4.28-1 java/
commit 889ffb93bb201e86ff93b6520629c974b1356371
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 4 16:39:55 2011 +0200
when hostname is unknown print "unknown"
diff --git a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
index 6681a89..6110a6c 100644
--- a/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
+++ b/java/code/webapp/WEB-INF/pages/systems/sdc/hardware.jsp
@@ -144,7 +144,14 @@
<bean:message key="sdc.details.hardware.network_hostname"/>
</th>
<td>
- ${network_hostname}
+ <c:choose>
+ <c:when test="${network_hostname == null}">
+ <bean:message key="sdc.details.overview.unknown"/>
+ </c:when>
+ <c:otherwise>
+ <c:out value="${network_hostname}" />
+ </c:otherwise>
+ </c:choose>
</td>
</tr>
<tr>
commit 4b4b1650ef4cd40b491764a949dee44506bcaf04
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Apr 4 16:25:37 2011 +0200
683200 - IDN.toUnicode does not allow null value
addressing:
java.lang.NullPointerException
at java.net.IDN.toUnicode(IDN.java:170)
at java.net.IDN.toUnicode(IDN.java:196)
at com.redhat.rhn.domain.server.Server.getDecodedHostname(Server.java:954)
at com.redhat.rhn.frontend.action.systems.sdc.SystemHardwareAction.setupForm(SystemHardwareAction.java:132)
at com.redhat.rhn.frontend.action.systems.sdc.SystemHardwareAction.execute(SystemHardwareAction.java:85)
at org.apache.struts.action.RequestProcessor.processActionPerform(RequestProcessor.java:431)
at org.apache.struts.action.RequestProcessor.process(RequestProcessor.java:237)
at com.redhat.rhn.frontend.struts.RhnRequestProcessor.process(RhnRequestProcessor.java:82)
at org.apache.struts.action.ActionServlet.process(ActionServlet.java:1196)
at org.apache.struts.action.ActionServlet.doGet(ActionServlet.java:414)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:690)
at javax.servlet.http.HttpServlet.service(HttpServlet.java:803)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:269)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at com.redhat.rhn.frontend.servlets.AuthFilter.doFilter(AuthFilter.java:101)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at com.opensymphony.module.sitemesh.filter.PageFilter.parsePage(PageFilter.java:142)
at com.opensymphony.module.sitemesh.filter.PageFilter.doFilter(PageFilter.java:58)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at com.redhat.rhn.frontend.servlets.LocalizedEnvironmentFilter.doFilter(LocalizedEnvironmentFilter.java:67)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at com.redhat.rhn.frontend.servlets.EnvironmentFilter.doFilter(EnvironmentFilter.java:108)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at com.redhat.rhn.frontend.servlets.SessionFilter.doFilter(SessionFilter.java:55)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at com.redhat.rhn.frontend.servlets.SetCharacterEncodingFilter.doFilter(SetCharacterEncodingFilter.java:97)
at org.apache.catalina.core.ApplicationFilterChain.internalDoFilter(ApplicationFilterChain.java:215)
at org.apache.catalina.core.ApplicationFilterChain.doFilter(ApplicationFilterChain.java:188)
at org.apache.catalina.core.StandardWrapperValve.invoke(StandardWrapperValve.java:210)
at org.apache.catalina.core.StandardContextValve.invoke(StandardContextValve.java:172)
at org.apache.catalina.core.StandardHostValve.invoke(StandardHostValve.java:127)
at org.apache.catalina.valves.ErrorReportValve.invoke(ErrorReportValve.java:117)
at org.apache.catalina.core.StandardEngineValve.invoke(StandardEngineValve.java:108)
at org.apache.catalina.connector.CoyoteAdapter.service(CoyoteAdapter.java:151)
at org.apache.jk.server.JkCoyoteHandler.invoke(JkCoyoteHandler.java:200)
at org.apache.jk.common.HandlerRequest.invoke(HandlerRequest.java:291)
at org.apache.jk.common.ChannelSocket.invoke(ChannelSocket.java:775)
at org.apache.jk.common.ChannelSocket.processConnection(ChannelSocket.java:704)
at org.apache.jk.common.ChannelSocket$SocketConnection.runIt(ChannelSocket.java:897)
at org.apache.tomcat.util.threads.ThreadPool$ControlRunnable.run(ThreadPool.java:685)
at java.lang.Thread.run(Thread.java:636)
diff --git a/java/code/src/com/redhat/rhn/domain/server/Server.java b/java/code/src/com/redhat/rhn/domain/server/Server.java
index a9507c8..c923115 100644
--- a/java/code/src/com/redhat/rhn/domain/server/Server.java
+++ b/java/code/src/com/redhat/rhn/domain/server/Server.java
@@ -951,7 +951,8 @@ public class Server extends BaseDomainHelper implements Identifiable {
* @return Returns the primary hostname for this server
*/
public String getDecodedHostname() {
- return IDN.toUnicode(getHostname());
+ String hostname = getHostname();
+ return (hostname == null) ? null : IDN.toUnicode(hostname);
}
/**
13 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.4.27-1'
by Michael Mraka
Tag 'spacewalk-java-1.4.27-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-04-04 12:19 +0000
Tagging package [spacewalk-java] version [1.4.27-1] in directory [java/].
Changes since yum-rhn-plugin-1.4.11-1:
Michael Mraka (1):
Automatic commit of package [spacewalk-java] release [1.4.27-1].
---
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
---
13 years, 1 month
java/spacewalk-java.spec rel-eng/packages
by Michael Mraka
java/spacewalk-java.spec | 8 +++++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 8 insertions(+), 2 deletions(-)
New commits:
commit 0b3c0ea6821d5742bb0c9e833fb064062482f8c7
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Apr 4 14:19:17 2011 +0200
Automatic commit of package [spacewalk-java] release [1.4.27-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index aec1e33..1db279e 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -17,7 +17,7 @@ Name: spacewalk-java
Summary: Spacewalk Java site packages
Group: Applications/Internet
License: GPLv2
-Version: 1.4.26
+Version: 1.4.27
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -532,6 +532,12 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Mon Apr 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.27-1
+- fixed queries on Virtual system Overview page
+- correct form property
+- Fix to remove message on entitlement consumption for virt guest subscribed to
+ cloned channels
+
* Fri Apr 01 2011 Jan Pazdziora 1.4.26-1
- 627791 - extending child channel selection area (tlestach(a)redhat.com)
- Do not show success message when passwords don't match (jrenner(a)suse.de)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index d0f0255..bfe0fdc 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.4.26-1 java/
+1.4.27-1 java/
13 years, 1 month
Changes to 'refs/tags/yum-rhn-plugin-1.4.11-1'
by Michael Mraka
Tag 'yum-rhn-plugin-1.4.11-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-04-04 12:00 +0000
Tagging package [yum-rhn-plugin] version [1.4.11-1] in directory [client/rhel/yum-rhn-plugin/].
Changes since rhn-client-tools-1.4.10-1:
Michael Mraka (2):
688870 - resolve --enablerepo/--disablerepo for RHN repos
Automatic commit of package [yum-rhn-plugin] release [1.4.11-1].
---
client/rhel/yum-rhn-plugin/rhnplugin.py | 9 +++++++++
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
3 files changed, 14 insertions(+), 2 deletions(-)
---
13 years, 1 month
client/rhel rel-eng/packages
by Michael Mraka
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 5 ++++-
rel-eng/packages/yum-rhn-plugin | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit d6fd613b0c2a0246d1bee27a6f26817928a29f7a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Apr 4 14:00:55 2011 +0200
Automatic commit of package [yum-rhn-plugin] release [1.4.11-1].
diff --git a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
index 29c9414..b1ebb5a 100644
--- a/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
+++ b/client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec
@@ -1,6 +1,6 @@
Summary: RHN support for yum
Name: yum-rhn-plugin
-Version: 1.4.10
+Version: 1.4.11
Release: 1%{?dist}
License: GPLv2
Group: System Environment/Base
@@ -72,6 +72,9 @@ fi
%doc LICENSE
%changelog
+* Mon Apr 04 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.11-1
+- 688870 - resolve --enablerepo/--disablerepo for RHN repos
+
* Fri Apr 01 2011 Miroslav Suchý 1.4.10-1
- 690234 - do not re-create repo if it exist and is type of RhnRepo
diff --git a/rel-eng/packages/yum-rhn-plugin b/rel-eng/packages/yum-rhn-plugin
index 5997cfa..70bf5c6 100644
--- a/rel-eng/packages/yum-rhn-plugin
+++ b/rel-eng/packages/yum-rhn-plugin
@@ -1 +1 @@
-1.4.10-1 client/rhel/yum-rhn-plugin/
+1.4.11-1 client/rhel/yum-rhn-plugin/
13 years, 1 month
client/rhel
by Michael Mraka
client/rhel/yum-rhn-plugin/rhnplugin.py | 9 +++++++++
1 file changed, 9 insertions(+)
New commits:
commit 1147d9d704d797483e0f30f086125468d91b9f1a
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Mon Apr 4 13:47:20 2011 +0200
688870 - resolve --enablerepo/--disablerepo for RHN repos
diff --git a/client/rhel/yum-rhn-plugin/rhnplugin.py b/client/rhel/yum-rhn-plugin/rhnplugin.py
index 9c799cf..0e2e728 100644
--- a/client/rhel/yum-rhn-plugin/rhnplugin.py
+++ b/client/rhel/yum-rhn-plugin/rhnplugin.py
@@ -193,6 +193,15 @@ def prereposetup_hook(conduit):
if cachefile:
cachefile.close()
+ # resolve --enablerepo/--disablerepo for RHN repos
+ opts = conduit.getCmdLine()[0]
+ for opt, repoexp in opts.repos:
+ if opt == '--enablerepo':
+ conduit._base.repos.enableRepo(repoexp)
+ elif opt == '--disablerepo':
+ conduit._base.repos.disableRepo(repoexp)
+
+
def posttrans_hook(conduit):
""" Post rpm transaction hook. We update the RHN profile here. """
global rhn_enabled
13 years, 1 month
Changes to 'refs/tags/rhn-client-tools-1.4.10-1'
by Michael Mraka
Tag 'rhn-client-tools-1.4.10-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-04-04 11:01 +0000
Tagging package [rhn-client-tools] version [1.4.10-1] in directory [client/rhel/rhn-client-tools/].
Changes since yum-rhn-plugin-1.4.10-1:
Michael Mraka (3):
fixed queries on Virtual system Overview page
urlsplit returns tuple on RHEL5
Automatic commit of package [rhn-client-tools] release [1.4.10-1].
Milan Zazrivec (1):
correct form property
---
client/rhel/rhn-client-tools/rhn-client-tools.spec | 6
client/rhel/rhn-client-tools/src/up2date_client/config.py | 4
java/code/src/com/redhat/rhn/common/db/datasource/xml/System_queries.xml | 76 +++++-----
java/code/webapp/WEB-INF/pages/errata/packages/add.jsp | 2
rel-eng/packages/rhn-client-tools | 2
5 files changed, 47 insertions(+), 43 deletions(-)
---
13 years, 1 month