Changes to 'refs/tags/spacewalk-backend-1.10.16-1'
by Michael Mraka
Tag 'spacewalk-backend-1.10.16-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2013-04-05 13:06 +0000
Tagging package [spacewalk-backend] version [1.10.16-1] in directory [backend/].
Changes since spacewalk-java-1.10.43-1:
Michael Mraka (2):
929238 - fixed local path for file:// repos
Automatic commit of package [spacewalk-backend] release [1.10.16-1].
Tomas Lestach (7):
enhance /rhn/errata/RelevantErrata.do
enhance /rhn/errata/AllErrata.do
removing unnecessarily nested else statement
removing unnecessary cast
948185 - fix system.listSystemEvents on PG
948185 - fixing checkstyle
link channel labels on /rhn/channels/manage/DistChannelMap.do page
---
backend/satellite_tools/repo_plugins/yum_src.py | 9 +++--
backend/spacewalk-backend.spec | 6 +++
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 12 +++++++
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 16 +++++++---
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 6 +--
java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp | 2 +
java/code/webapp/WEB-INF/pages/errata/all.jsp | 2 +
java/code/webapp/WEB-INF/pages/errata/relevant.jsp | 2 +
rel-eng/packages/spacewalk-backend | 2 -
10 files changed, 45 insertions(+), 14 deletions(-)
---
11 years, 1 month
2 commits - backend/satellite_tools backend/spacewalk-backend.spec rel-eng/packages
by Michael Mraka
backend/satellite_tools/repo_plugins/yum_src.py | 9 ++++++---
backend/spacewalk-backend.spec | 6 +++++-
rel-eng/packages/spacewalk-backend | 2 +-
3 files changed, 12 insertions(+), 5 deletions(-)
New commits:
commit 0e4e360e867ca37b5c5bdef4bd73f3be36186710
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Apr 5 15:06:17 2013 +0200
Automatic commit of package [spacewalk-backend] release [1.10.16-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 010b092..8c94d31 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.15
+Version: 1.10.16
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -638,6 +638,10 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Fri Apr 05 2013 Michael Mraka <michael.mraka(a)redhat.com> 1.10.16-1
+- 929238 - fixed local path for file:// repos
+- 918333 - reflect schema change
+
* Wed Mar 27 2013 Milan Zazrivec <mzazrivec(a)redhat.com> 1.10.15-1
- abrt: check the package string is complete
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index a87a36f..05795be 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.10.15-1 backend/
+1.10.16-1 backend/
commit 2b27e1ce58be1db588539d383953a4c31b3c06a9
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Fri Apr 5 14:48:09 2013 +0200
929238 - fixed local path for file:// repos
Fedora 18 has new yum which verifies downloaded packages via
package.verifyLocalPkg() and complains about wrong path.
fixing
1/10 : test-srsJ-0.1-1-0.noarch
Downloaded package test-srsJ-0.1-1.noarch, from spacewalk-repo-sync-test-channel-17458, but it was invalid.
diff --git a/backend/satellite_tools/repo_plugins/yum_src.py b/backend/satellite_tools/repo_plugins/yum_src.py
index d7ff116..fef2a4e 100644
--- a/backend/satellite_tools/repo_plugins/yum_src.py
+++ b/backend/satellite_tools/repo_plugins/yum_src.py
@@ -127,9 +127,12 @@ class ContentSource(object):
# base_persistdir have to be set before pkgdir
if hasattr(repo, 'base_persistdir'):
repo.base_persistdir = CACHE_DIR
- pkgdir = os.path.join(CFG.MOUNT_POINT, CFG.PREPENDED_DIR, '1', 'stage')
- if not os.path.isdir(pkgdir):
- fileutils.makedirs(pkgdir, user='apache', group='apache')
+ if (self.url.find("file://") < 0):
+ pkgdir = os.path.join(CFG.MOUNT_POINT, CFG.PREPENDED_DIR, '1', 'stage')
+ if not os.path.isdir(pkgdir):
+ fileutils.makedirs(pkgdir, user='apache', group='apache')
+ else:
+ pkgdir = self.url[7:]
repo.pkgdir = pkgdir
yb_cfg = self.yumbase.conf.cfg
11 years, 1 month
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 6 ++++--
java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 8e8469eb9e873faadab449e1304b843d20042a2a
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 5 14:37:35 2013 +0200
link channel labels on /rhn/channels/manage/DistChannelMap.do page
diff --git a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
index b79026e..3475647 100644
--- a/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
+++ b/java/code/webapp/WEB-INF/pages/channel/manage/distchannelmap.jsp
@@ -59,7 +59,9 @@
headerkey="channel.edit.jsp.label"
sortattr="channel.label"
>
+ <a href="/rhn/channels/ChannelDetail.do?cid=${current.channel.id}">
${current.channel.label}
+ </a>
</rl:column>
<rl:column
bound="false"
commit 61521af5e98252f0d41b4913a17a00467fea40b5
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 5 14:52:28 2013 +0200
948185 - fixing checkstyle
addressing:
./code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java:2316: Line is longer than 92 characters.
./code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java:2319: Line is longer than 92 characters.
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index f5accad..58a4cb7 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -2313,10 +2313,12 @@ public class SystemHandler extends BaseHandler {
String diffString = "";
Object diff = file.get("diff");
if (diff instanceof byte[]) {
- diffString = HibernateFactory.getByteArrayContents((byte[]) file.get("diff"));
+ diffString = HibernateFactory.getByteArrayContents(
+ (byte[]) file.get("diff"));
}
else {
- diffString = HibernateFactory.blobToString((Blob) file.get("diff"));
+ diffString = HibernateFactory.blobToString(
+ (Blob) file.get("diff"));
}
if (diffString != null) {
info.put("result", diffString);
11 years, 1 month
java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java | 14 +++++++---
1 file changed, 10 insertions(+), 4 deletions(-)
New commits:
commit 67c0b675d6131d594c492c215087b3f150a09d35
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 5 13:51:55 2013 +0200
948185 - fix system.listSystemEvents on PG
actions of configfiles.diff type caused:
java.lang.ClassCastException: [B cannot be cast to java.sql.Blob at
com.redhat.rhn.frontend.xmlrpc.system.SystemHandler.listSystemEvents(SystemHandler.java:2313)
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
index c21af31..f5accad 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/system/SystemHandler.java
@@ -2310,10 +2310,16 @@ public class SystemHandler extends BaseHandler {
else {
// if there wasn't an error, check to see if there was a difference
// detected...
- Blob blob = (Blob) file.get("diff");
- if (blob != null) {
- String diff = HibernateFactory.blobToString(blob);
- info.put("result", diff);
+ String diffString = "";
+ Object diff = file.get("diff");
+ if (diff instanceof byte[]) {
+ diffString = HibernateFactory.getByteArrayContents((byte[]) file.get("diff"));
+ }
+ else {
+ diffString = HibernateFactory.blobToString((Blob) file.get("diff"));
+ }
+ if (diffString != null) {
+ info.put("result", diffString);
}
}
additionalInfo.add(info);
11 years, 1 month
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java | 2 +-
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 6 ++----
2 files changed, 3 insertions(+), 5 deletions(-)
New commits:
commit e4737a128985150cf9cf29bd4e5505eaad75e124
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 5 10:36:33 2013 +0200
removing unnecessary cast
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
index 82bd4dc..e64aec6 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
@@ -144,7 +144,7 @@ public class SchedulePackageRemoveAction extends RhnListAction implements Listab
TagHelper.bindElaboratorTo("groupList", results.getElaborator(), request);
- return (List<Map>)results;
+ return results;
}
/**
commit a2bc40e7955592e3e7ca78589081dc8faefb28c1
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 5 10:35:54 2013 +0200
removing unnecessarily nested else statement
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index 1769300..828dabc 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1226,10 +1226,8 @@ public class ActionManager extends BaseManager {
return (PackageAction) schedulePackageAction(scheduler, pkgs,
ActionFactory.TYPE_PACKAGES_REMOVE, earliestAction, srvr);
}
- else {
- return (PackageAction) schedulePackageAction(scheduler, pkgs,
- ActionFactory.TYPE_SOLARISPKGS_REMOVE, earliestAction, srvr);
- }
+ return (PackageAction) schedulePackageAction(scheduler, pkgs,
+ ActionFactory.TYPE_SOLARISPKGS_REMOVE, earliestAction, srvr);
}
/**
11 years, 1 month
2 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 12 ++++++++++
java/code/webapp/WEB-INF/pages/errata/all.jsp | 2 +
java/code/webapp/WEB-INF/pages/errata/relevant.jsp | 2 +
3 files changed, 16 insertions(+)
New commits:
commit 8243034547b871fd2f7761aa22c7c27cbb0e67c0
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 5 10:00:28 2013 +0200
enhance /rhn/errata/AllErrata.do
according to /rhn/errata/RelevantErrata.do
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 6c1d93f..bc34fdb 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
@@ -3170,6 +3170,12 @@ button below, and <b>will be unable to log back in</b>.</source>
<context context-type="sourcefile">/rhn/errata/Overview.do</context>
</context-group>
</trans-unit>
+ <trans-unit id="errata.all.jsp.summary">
+ <source>The following errata list represents all errata accessible by your organization.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/errata/Overview.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="affectedsystems.jsp.summary">
<source>Below is a list of systems affected by this erratum.</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/errata/all.jsp b/java/code/webapp/WEB-INF/pages/errata/all.jsp
index d3b0d4f..4b2e46b 100644
--- a/java/code/webapp/WEB-INF/pages/errata/all.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/all.jsp
@@ -17,6 +17,8 @@
<rhn:dialogmenu mindepth="0" maxdepth="3" definition="/WEB-INF/nav/errata_all_tabs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+<p><bean:message key="errata.all.jsp.summary"/></p>
+
<%@ include file="/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf" %>
</body>
commit 98083d8ccbdc499b112ed9b4d66861deab27a126
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Fri Apr 5 09:20:29 2013 +0200
enhance /rhn/errata/RelevantErrata.do
as we had before
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 201f985..6c1d93f 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
@@ -3164,6 +3164,12 @@ button below, and <b>will be unable to log back in</b>.</source>
</context>
</context-group>
</trans-unit>
+ <trans-unit id="errata.overview.jsp.summary">
+ <source>The following errata apply to at least one system to which you have administrative access.</source>
+ <context-group name="ctx">
+ <context context-type="sourcefile">/rhn/errata/Overview.do</context>
+ </context-group>
+ </trans-unit>
<trans-unit id="affectedsystems.jsp.summary">
<source>Below is a list of systems affected by this erratum.</source>
<context-group name="ctx">
diff --git a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
index 7388cc9..74d71e3 100644
--- a/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
+++ b/java/code/webapp/WEB-INF/pages/errata/relevant.jsp
@@ -17,6 +17,8 @@
<rhn:dialogmenu mindepth="0" maxdepth="3" definition="/WEB-INF/nav/errata_relevant_tabs.xml" renderer="com.redhat.rhn.frontend.nav.DialognavRenderer" />
+<p><bean:message key="errata.overview.jsp.summary"/></p>
+
<%@ include file="/WEB-INF/pages/common/fragments/errata/relevant-errata-list.jspf" %>
</body>
11 years, 1 month
Changes to 'refs/tags/spacewalk-java-1.10.43-1'
by Grant Gainey
Tag 'spacewalk-java-1.10.43-1' created by Grant Gainey <ggainey(a)redhat.com> at 2013-04-04 20:56 +0000
Tagging package [spacewalk-java] version [1.10.43-1] in directory [java/].
Changes since rhncfg-5.10.44-1:
Grant Gainey (2):
948605: checkstyle whitespace fixes. Sigh.
Automatic commit of package [spacewalk-java] release [1.10.43-1].
---
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java | 6 ++--
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java | 6 ++--
java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java | 4 +-
java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java | 6 ++--
java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java | 14 +++++-----
java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java | 6 ++--
java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java | 4 +-
java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java | 2 -
java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java | 2 -
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 4 +-
java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 4 +-
java/spacewalk-java.spec | 5 ++-
rel-eng/packages/spacewalk-java | 2 -
15 files changed, 36 insertions(+), 33 deletions(-)
---
11 years, 1 month
java/spacewalk-java.spec rel-eng/packages
by Grant Gainey
java/spacewalk-java.spec | 5 ++++-
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit c02bde3e0d674c52366f2dd0acd4a50a24bdf73a
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Thu Apr 4 16:56:55 2013 -0400
Automatic commit of package [spacewalk-java] release [1.10.43-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index f186403..8b6fd8b 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.42
+Version: 1.10.43
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -678,6 +678,9 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Thu Apr 04 2013 Grant Gainey 1.10.43-1
+- 948605: checkstyle whitespace fixes. Sigh.
+
* Thu Apr 04 2013 Grant Gainey 1.10.42-1
- 947205: Allow remote-cmd as part of SSM Package install/update/remove *
Refactored Ssm*PackageEvent/Action * Corrected error-messaging when systems
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index c563a74..8f06ddb 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.10.42-1 java/
+1.10.43-1 java/
11 years, 1 month
java/code
by Grant Gainey
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java | 6 ++--
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java | 2 -
java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java | 6 ++--
java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java | 4 +-
java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java | 6 ++--
java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java | 14 +++++-----
java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java | 6 ++--
java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java | 4 +-
java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java | 2 -
java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java | 2 -
java/code/src/com/redhat/rhn/manager/action/ActionManager.java | 4 +-
java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java | 4 +-
13 files changed, 31 insertions(+), 31 deletions(-)
New commits:
commit 0a62299142752c970f5f0b26afe667c02c34a1a9
Author: Grant Gainey <ggainey(a)redhat.com>
Date: Thu Apr 4 16:55:51 2013 -0400
948605: checkstyle whitespace fixes. Sigh.
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
index abeb9f9..82bd4dc 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SchedulePackageRemoveAction.java
@@ -78,7 +78,7 @@ public class SchedulePackageRemoveAction extends RhnListAction implements Listab
Map params = new HashMap();
params.put(RequestContext.MODE,
requestContext.getRequiredParamAsString(RequestContext.MODE));
-
+
if (request.getParameter("dispatch") != null) {
String packagesDecl = request.getParameter("packagesDecl");
if (requestContext.wasDispatched("installconfirm.jsp.confirm")) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java
index 9676501..83c7639 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/ScheduleRemoteCommand.java
@@ -63,7 +63,7 @@ import com.redhat.rhn.manager.system.SystemManager;
/**
* ScheduleRemoteCommand
- *
+ *
* @version $Rev$
*/
public class ScheduleRemoteCommand extends RhnAction {
@@ -193,7 +193,7 @@ public class ScheduleRemoteCommand extends RhnAction {
else if (MODE_UPGRADE.equals(mode)) {
List<Map> result = getUpgradeResult(ctxt, sessionSetLabel);
- Map<Long, List<Map<String, Long>>> sysPackageSet =
+ Map<Long, List<Map<String, Long>>> sysPackageSet =
new HashMap<Long, List<Map<String, Long>>>();
for (Map sys : result) {
Long sysId = (Long) sys.get("id");
@@ -264,7 +264,7 @@ public class ScheduleRemoteCommand extends RhnAction {
// bz465892 - As the selected packages are parsed, remove duplicates
// keeping the highest EVR
- Map<String, PackageListItem> packageNameIdsToItems =
+ Map<String, PackageListItem> packageNameIdsToItems =
new HashMap<String, PackageListItem>(data.size());
for (String idCombo : data) {
diff --git a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
index b8ac8c1..90b619f 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/rhnpackage/ssm/SelectInstallationPackagesAction.java
@@ -36,7 +36,7 @@ import javax.servlet.http.HttpServletResponse;
/**
* SSM action for selecting the packages to install. Package list is determined by the
* first step in the flow where the channel is selected.
- *
+ *
* @version $Revision$
*/
public class SelectInstallationPackagesAction extends RhnAction implements Listable {
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java
index a9c4c54..8f7ba0a 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesAction.java
@@ -37,7 +37,7 @@ public class SsmInstallPackagesAction extends SsmPackagesAction {
protected String getOperationName() {
return "ssm.package.install.operationname";
}
-
+
protected List<Long> getAffectedServers(SsmPackageEvent event, User u) {
SsmInstallPackagesEvent sipe = (SsmInstallPackagesEvent) event;
Long channelId = sipe.getChannelId();
@@ -61,7 +61,7 @@ public class SsmInstallPackagesAction extends SsmPackagesAction {
Set<String> data = sipe.getPackages();
// Convert the package list to domain objects
- List<PackageListItem> packageListItems =
+ List<PackageListItem> packageListItems =
new ArrayList<PackageListItem>(data.size());
for (String key : data) {
packageListItems.add(PackageListItem.parse(key));
@@ -73,7 +73,7 @@ public class SsmInstallPackagesAction extends SsmPackagesAction {
List<Action> pkgActions = ActionManager.schedulePackageInstall(user, sids,
packageListData, earliest);
-
+
return pkgActions;
}
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java
index 1316949..8133d51 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmInstallPackagesEvent.java
@@ -30,7 +30,7 @@ public class SsmInstallPackagesEvent extends SsmPackageEvent {
/**
* Creates a new event to install a set of packages on systems in the SSM.
- *
+ *
* @param userIdIn user making the changes; cannot be <code>null</code>
* @param earliestIn earliest time to perform the installation; can be
* <code>null</code>
@@ -61,7 +61,7 @@ public class SsmInstallPackagesEvent extends SsmPackageEvent {
/**
* Creates a new event to install a set of packages on systems in the SSM.
- *
+ *
* @param userIdIn user making the changes; cannot be <code>null</code>
* @param earliestIn earliest time to perform the installation; can be
* <code>null</code>
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java b/java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java
index 8da985d..b2592a7 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmPackageEvent.java
@@ -22,9 +22,9 @@ import com.redhat.rhn.domain.action.script.ScriptActionDetails;
/**
* Base for SSM package install/update/remove actions. Holds the data shared between the
* three paths.
- *
+ *
* @author ggainey
- *
+ *
*/
public abstract class SsmPackageEvent implements EventMessage {
@@ -35,7 +35,7 @@ public abstract class SsmPackageEvent implements EventMessage {
/**
* Creates a new event to install a set of packages on systems in the SSM.
- *
+ *
* @param userIdIn user making the changes; cannot be <code>null</code>
* @param earliestIn earliest time to perform the installation; can be
* <code>null</code>
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java
index 069edf2..7bb4fa9 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmPackagesAction.java
@@ -34,7 +34,7 @@ import com.redhat.rhn.manager.ssm.SsmOperationManager;
* Base functionality for responding to SSM package install/update/remove.
* Handles ordering if a remote-cmd has been specified. Subclasses are responsible
* for describing the affected servers, and the actual work of scheduling action(s)
- *
+ *
* @author ggainey
*
*/
@@ -57,18 +57,18 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction {
* The following isn't 100% accurate. All systems in the SSM are associated with
* the operation, however only systems on which the package already exists (since
* this is an upgrade) will actually have events scheduled.
- *
+ *
* The problem is that the list of servers to which the package upgrades apply is
* never stored in an RhnSet, which is used to make the impact of this call
* minimal. The correct list is showed to the user before selecting confirm, so
* the only potential issue is in viewing the SSM task log after the user has
* confirmed the operation. Again, the events themselves are correctly scheduled
* on only the systems to which they apply.
- *
+ *
* For now, this small potential for logging inaccuracy is acceptable given the
* proxmity of this fix to the Satellite 5.3 release (as opposed to omitting the
* server association to the task entirely).
- *
+ *
* jdobies, Aug 12, 2009
*/
@@ -88,10 +88,10 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction {
log.debug("Time to schedule all actions: " +
(System.currentTimeMillis() - actionStart));
}
- }
+ }
catch (Exception e) {
log.error("Error scheduling package installations for event " + event, e);
- }
+ }
finally {
// This should stay in the finally block so the operation is
// not perpetually left in an in progress state
@@ -157,7 +157,7 @@ public abstract class SsmPackagesAction extends AbstractDatabaseAction {
}
protected abstract String getOperationName();
-
+
protected abstract List<Long> getAffectedServers(SsmPackageEvent event, User u);
protected abstract List<Action> doSchedule(SsmPackageEvent event,
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
index 577c6a9..b1eebe0 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmRemovePackagesAction.java
@@ -30,7 +30,7 @@ import com.redhat.rhn.manager.action.ActionManager;
/**
* Handles removing packages from servers in the SSM.
- *
+ *
* @see com.redhat.rhn.frontend.events.SsmRemovePackagesEvent
*/
public class SsmRemovePackagesAction extends SsmPackagesAction {
@@ -65,13 +65,13 @@ public class SsmRemovePackagesAction extends SsmPackagesAction {
* removals into a single action. The schedule package removal page will display a
* fine grained mapping of server to package removed (taking into account to only
* show packages that exist on the server).
- *
+ *
* However, there is no issue in requesting a client delete a package it doesn't
* have. So when we create the action, populate it with all packages and for every
* server to which any package removal applies. This will let us keep all of the
* removals coupled under a single scheduled action and won't cause an issue on
* the client when the scheduled removals are picked up.
- *
+ *
* jdobies, Apr 8, 2009
*/
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java
index c13a34f..5620c22 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesAction.java
@@ -25,7 +25,7 @@ import com.redhat.rhn.manager.action.ActionManager;
/**
* Handles removing packages from servers in the SSM.
- *
+ *
* @see com.redhat.rhn.frontend.events.SsmUpgradePackagesEvent
*/
public class SsmUpgradePackagesAction extends SsmPackagesAction {
@@ -33,7 +33,7 @@ public class SsmUpgradePackagesAction extends SsmPackagesAction {
protected String getOperationName() {
return "ssm.package.upgrade.operationname";
}
-
+
protected List<Long> getAffectedServers(SsmPackageEvent event, User u) {
SsmUpgradePackagesEvent supe = (SsmUpgradePackagesEvent) event;
List<Long> sids = new ArrayList<Long>();
diff --git a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java
index c065091..f11c0c2 100644
--- a/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java
+++ b/java/code/src/com/redhat/rhn/frontend/events/SsmUpgradePackagesEvent.java
@@ -56,7 +56,7 @@ public class SsmUpgradePackagesEvent extends SsmPackageEvent {
}
sysPackageSet = sysPackageSetIn;
}
-
+
/**
* Creates a new SSM upgrade packages event.
*
diff --git a/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java b/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java
index 2a12b78..30701e9 100644
--- a/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java
+++ b/java/code/src/com/redhat/rhn/manager/MissingCapabilityException.java
@@ -44,7 +44,7 @@ public class MissingCapabilityException extends RhnRuntimeException {
/**
* Constructor for exception on missing capability on a bunch of servers.
- *
+ *
* @param missingCapability the missing capability.
* @param sid the ID of the server missing the capability
*/
diff --git a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
index 1e25e20..1769300 100644
--- a/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
+++ b/java/code/src/com/redhat/rhn/manager/action/ActionManager.java
@@ -1246,7 +1246,7 @@ public class ActionManager extends BaseManager {
List<Action> actions = new ArrayList<Action>();
Action anAction;
-
+
// Different handling for package removal on solaris v. rhel, so split out
// the servers first in case the list is mixed.
Set<Long> rhelServers = new HashSet<Long>();
@@ -1390,7 +1390,7 @@ public class ActionManager extends BaseManager {
/**
* Schedules a script action for the given servers
- *
+ *
* @param scheduler User scheduling the action.
* @param sids Servers for which the action affects.
* @param script The set of packages to be removed.
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 5cbb66f..2d171ee 100644
--- a/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java
+++ b/java/code/src/com/redhat/rhn/manager/ssm/SsmManager.java
@@ -235,11 +235,11 @@ public class SsmManager {
set.clear();
RhnSetManager.store(set);
}
-
+
/**
* Returns a list of server-ids of the servers in the SSM selection, for the specified
* user
- *
+ *
* @param user user whose system-set we care about
* @return list of server-ids
*/
11 years, 1 month
Changes to 'refs/tags/rhncfg-5.10.44-1'
by StephenHerr
Tag 'rhncfg-5.10.44-1' created by Stephen Herr <sherr(a)redhat.com> at 2013-04-04 19:17 +0000
Tagging package [rhncfg] version [5.10.44-1] in directory [client/tools/rhncfg/].
Changes since spacewalk-java-1.10.42-1:
Neha Rawat (1):
948605 - make diffs initiated from Satellite obey display_diff config option
Stephen Herr (1):
Automatic commit of package [rhncfg] release [5.10.44-1].
---
client/tools/rhncfg/config_common/file_utils.py | 4 +++-
client/tools/rhncfg/rhncfg.spec | 6 +++++-
rel-eng/packages/rhncfg | 2 +-
3 files changed, 9 insertions(+), 3 deletions(-)
---
11 years, 1 month