spacewalk-commits August 2012

spacewalk-commits@lists.fedorahosted.org

9 participants
192 discussions

Changes to 'refs/tags/spacewalk-java-1.8.132-1'
by Tomas Lestach 23 Aug '12

23 Aug '12

Tag 'spacewalk-java-1.8.132-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2012-08-23 15:59 +0000 Tagging package [spacewalk-java] version [1.8.132-1] in directory [java/]. Changes since oracle-rhnsat-selinux-10.2.0.22-1: Tomas Lestach (5): 850836 - fix ISE on rhn/channel/ssm/ChildSubscriptions.do page 850836 - display an information message about no systems being selected 851150 - we need only unique channel list 851040 - detect empty quartz crop expression Automatic commit of package [spacewalk-java] release [1.8.132-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 +- java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java | 6 ++++-- java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java | 8 ++++++-- java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 6 ++++-- java/spacewalk-java.spec | 9 ++++++++- rel-eng/packages/spacewalk-java | 2 +- 6 files changed, 24 insertions(+), 9 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach 23 Aug '12

23 Aug '12

java/spacewalk-java.spec | 9 ++++++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) New commits: commit 60e412d716bba683b283c3452c248ec47f5b5479 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Aug 23 17:59:26 2012 +0200 Automatic commit of package [spacewalk-java] release [1.8.132-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index df7d1e3..f651ce4 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.131 +Version: 1.8.132 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -614,6 +614,13 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Aug 23 2012 Tomas Lestach <tlestach(a)redhat.com> 1.8.132-1 +- 851040 - detect empty quartz crop expression +- 851150 - we need only unique channel list +- 850836 - display an information message about no systems being selected for + SSM +- 850836 - fix ISE on rhn/channel/ssm/ChildSubscriptions.do page + * Tue Aug 21 2012 Tomas Kasparek <tkasparek(a)redhat.com> 1.8.131-1 - 846215 - Kickstarts profile visible where they should be diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index d576d20..cf968f4 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.8.131-1 java/ +1.8.132-1 java/

1 0

java/code
by Tomas Lestach 23 Aug '12

23 Aug '12

java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) New commits: commit 24e8a9dd5dab5913c82565ddd2c66deda51716ad Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Aug 23 17:23:33 2012 +0200 851040 - detect empty quartz crop expression diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java index 5bbea66..c8c5112 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/SyncRepositoriesAction.java @@ -29,6 +29,7 @@ import com.redhat.rhn.manager.user.UserManager; import com.redhat.rhn.taskomatic.TaskomaticApi; import com.redhat.rhn.taskomatic.TaskomaticApiException; +import org.apache.commons.lang.StringUtils; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -121,12 +122,13 @@ public class SyncRepositoriesAction extends RhnAction implements Listable { } else if (context.wasDispatched("schedule.button")) { - if (picker.isDisabled() && oldCronExpr != null) { + if ((picker.isDisabled() || StringUtils.isEmpty(picker.getCronEntry())) && + oldCronExpr != null) { taskomatic.unscheduleRepoSync(chan, user); createSuccessMessage(request, "message.syncschedule.disabled", chan.getName()); } - else if (picker.getCronEntry() != null) { + else if (!StringUtils.isEmpty(picker.getCronEntry())) { Date date = taskomatic.scheduleRepoSync(chan, user, picker.getCronEntry()); createSuccessMessage(request, "message.syncscheduled",

1 0

java/code
by Tomas Lestach 23 Aug '12

23 Aug '12

java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 1643021974b0f74f9f3b7506584f970fdf9046a2 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Aug 23 14:26:11 2012 +0200 851150 - we need only unique channel list diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml index 7f121b8..60a6cfb 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml @@ -506,7 +506,7 @@ ORDER BY rhn_channel.channel_priority(ACh.parent_or_self_id), ACh.parent_or_sel <mode name="all_channels_tree"> <query params="user_id"> -SELECT C.name, +SELECT distinct C.name, UC.channel_id ID, PC.label PARENT_CHANNEL, C.label,

1 0

2 commits - java/code
by Tomas Lestach 23 Aug '12

23 Aug '12

java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java | 8 ++++++-- java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 6 ++++-- 2 files changed, 10 insertions(+), 4 deletions(-) New commits: commit a500cd4df0863138f9d949a4ef2262b17f83837f Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Aug 23 12:17:42 2012 +0200 850836 - display an information message about no systems being selected for SSM diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java index c35e27a..0d5f056 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java +++ b/java/code/src/com/redhat/rhn/frontend/action/channel/ssm/ChildChannelAction.java @@ -72,7 +72,10 @@ public class ChildChannelAction extends RhnAction { // If submitted, save the user's choices for the confirm page if (isSubmitted(daForm) && request.getParameter("dispatch") != null) { - processList(user, request); + if (processList(user, request) == 0) { + createSuccessMessage(request, "ssmchildsubconfirm.jsp.noSystems", null); + return mapping.findForward(RhnHelper.DEFAULT_FORWARD); + } return mapping.findForward("success"); } return mapping.findForward(RhnHelper.DEFAULT_FORWARD); @@ -134,7 +137,7 @@ public class ChildChannelAction extends RhnAction { * @param user user making the request * @param request http request to grab the user submitted data from */ - protected void processList(User user, HttpServletRequest request) { + protected int processList(User user, HttpServletRequest request) { List<String> subList = new ArrayList<String>(); List<String> unsubList = new ArrayList<String>(); @@ -152,6 +155,7 @@ public class ChildChannelAction extends RhnAction { } storeChannelChanges(user, subList, unsubList); + return subList.size() + unsubList.size(); } /** commit eaa576f4a5ce3271eb94804a3ad0733d29ca36c7 Author: Tomas Lestach <tlestach(a)redhat.com> Date: Wed Aug 22 18:52:15 2012 +0200 850836 - fix ISE on rhn/channel/ssm/ChildSubscriptions.do page addressing: java.lang.NullPointerException at com.redhat.rhn.manager.ssm.SsmManager.verifyChildEntitlements(SsmMana ger.java:79) at com.redhat.rhn.frontend.action.channel.ssm.ChildChannelConfirmAction. execute(ChildChannelConfirmAction.java:94) diff --git a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java index 39fdd1a..ea0de7b 100644 --- a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java +++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java @@ -76,8 +76,10 @@ public class SsmManager { RhnSet ssm = RhnSetDecl.SYSTEMS.lookup(user); List<Server> servers = new ArrayList<Server>(); - for (RhnSetElement rse : ssm.getElements()) { - servers.add(SystemManager.lookupByIdAndUser(rse.getElement(), user)); + if (ssm != null) { + for (RhnSetElement rse : ssm.getElements()) { + servers.add(SystemManager.lookupByIdAndUser(rse.getElement(), user)); + } } // Keeps a mapping of how many entitlements are left on each channel. This map

1 0

Changes to 'refs/tags/oracle-rhnsat-selinux-10.2.0.22-1'
by Michael Mraka 22 Aug '12

22 Aug '12

Tag 'oracle-rhnsat-selinux-10.2.0.22-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-08-22 14:06 +0000 Tagging package [oracle-rhnsat-selinux] version [10.2.0.22-1] in directory [selinux/oracle-rhnsat-selinux/]. Changes since spacewalk-schema-1.8.71-1: Michael Mraka (1): Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.22-1]. --- rel-eng/packages/oracle-rhnsat-selinux | 2 +- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

rel-eng/packages selinux/oracle-rhnsat-selinux
by Michael Mraka 22 Aug '12

22 Aug '12

rel-eng/packages/oracle-rhnsat-selinux | 2 +- selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 3b492c347ca2ba3f890749243cba6c0b8d42a04f Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Aug 22 16:06:25 2012 +0200 Automatic commit of package [oracle-rhnsat-selinux] release [10.2.0.22-1]. diff --git a/rel-eng/packages/oracle-rhnsat-selinux b/rel-eng/packages/oracle-rhnsat-selinux index 763f16e..3bca041 100644 --- a/rel-eng/packages/oracle-rhnsat-selinux +++ b/rel-eng/packages/oracle-rhnsat-selinux @@ -1 +1 @@ -10.2.0.21-1 selinux/oracle-rhnsat-selinux/ +10.2.0.22-1 selinux/oracle-rhnsat-selinux/ diff --git a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec index 7bcc73a..07a07c4 100644 --- a/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec +++ b/selinux/oracle-rhnsat-selinux/oracle-rhnsat-selinux.spec @@ -5,7 +5,7 @@ %define modulename oracle-rhnsat Name: oracle-rhnsat-selinux -Version: 10.2.0.21 +Version: 10.2.0.22 Release: 1%{?dist} Summary: SELinux policy module supporting Oracle Group: System Environment/Base @@ -106,6 +106,9 @@ fi %attr(0755,root,root) %{_sbindir}/%{name}-enable %changelog +* Wed Aug 22 2012 Michael Mraka <michael.mraka(a)redhat.com> 10.2.0.22-1 +- 799131 - allow oracle db to read logs/*.aud files + * Mon Jul 16 2012 Jan Pazdziora 10.2.0.21-1 - Start using the .tar.gz in the .src.rpm for oracle-rhnsat-selinux. - %%defattr is not needed since rpm 4.4

1 0

rel-eng/packages schema/spacewalk
by Michael Mraka 22 Aug '12

22 Aug '12

rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 1013fd17b738464c6f677a15908957fb658a0066 Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Wed Aug 22 16:05:26 2012 +0200 Automatic commit of package [spacewalk-schema] release [1.8.71-1]. diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema index 0128278..81ef0ae 100644 --- a/rel-eng/packages/spacewalk-schema +++ b/rel-eng/packages/spacewalk-schema @@ -1 +1 @@ -1.8.70-1 schema/spacewalk/ +1.8.71-1 schema/spacewalk/ diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec index edcbd0f..39e1463 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.70 +Version: 1.8.71 Release: 1%{?dist} Source0: %{name}-%{version}.tar.gz @@ -68,6 +68,9 @@ rm -rf $RPM_BUILD_ROOT %{_mandir}/man1/spacewalk-sql* %changelog +* Wed Aug 22 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.71-1 +- Insert pxt session errors on postgres + * Fri Aug 10 2012 Michael Mraka <michael.mraka(a)redhat.com> 1.8.70-1 - 843374 - fixed subquery in FROM must have an alias - 843374 - upgrade script for rhnChannelNewestPackageView

1 0

Changes to 'refs/tags/spacewalk-schema-1.8.71-1'
by Michael Mraka 22 Aug '12

22 Aug '12

Tag 'spacewalk-schema-1.8.71-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-08-22 14:05 +0000 Tagging package [spacewalk-schema] version [1.8.71-1] in directory [schema/spacewalk/]. Changes since oracle-server-admin-0.2.2-1: Michael Mraka (1): Automatic commit of package [spacewalk-schema] release [1.8.71-1]. --- rel-eng/packages/spacewalk-schema | 2 +- schema/spacewalk/spacewalk-schema.spec | 5 ++++- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

Changes to 'refs/tags/oracle-server-admin-0.2.2-1'
by Michael Mraka 22 Aug '12

22 Aug '12

Tag 'oracle-server-admin-0.2.2-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2012-08-22 14:05 +0000 Tagging package [oracle-server-admin] version [0.2.2-1] in directory [projects/oracle-server-admin/]. Changes since spacewalk-setup-jabberd-1.8.4-1: Michael Mraka (1): Automatic commit of package [oracle-server-admin] release [0.2.2-1]. --- projects/oracle-server-admin/oracle-server-admin.spec | 5 ++++- rel-eng/packages/oracle-server-admin | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) ---

1 0

← Newer
1
...
4
5
6
7
8
9
10
...
20
Older →

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits August 2012