Changes to 'refs/tags/spacewalk-web-0.6.17-1'
by Jan Pazdziora
Tag 'spacewalk-web-0.6.17-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-08-04 06:51 +0000
Tagging package [spacewalk-web] version [0.6.17-1] in directory [web/].
Changes since osad-5.9.21-1:
Jan Pazdziora (1):
Automatic commit of package [spacewalk-web] release [0.6.17-1].
---
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 8 months
rel-eng/packages web/spacewalk-web.spec
by Jan Pazdziora
rel-eng/packages/spacewalk-web | 2 +-
web/spacewalk-web.spec | 5 ++++-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit 41147453a021cfb54c24a8d8a9886112a00d044f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 4 08:51:57 2009 +0200
Automatic commit of package [spacewalk-web] release [0.6.17-1].
diff --git a/rel-eng/packages/spacewalk-web b/rel-eng/packages/spacewalk-web
index 3326a8b..2922b28 100644
--- a/rel-eng/packages/spacewalk-web
+++ b/rel-eng/packages/spacewalk-web
@@ -1 +1 @@
-0.6.16-1 web/
+0.6.17-1 web/
diff --git a/web/spacewalk-web.spec b/web/spacewalk-web.spec
index e6f4911..1fe84a1 100644
--- a/web/spacewalk-web.spec
+++ b/web/spacewalk-web.spec
@@ -2,7 +2,7 @@ Name: spacewalk-web
Summary: Spacewalk Web site packages
Group: Applications/Internet
License: GPLv2
-Version: 0.6.16
+Version: 0.6.17
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -317,6 +317,9 @@ rm -rf $RPM_BUILD_ROOT
# $Id$
%changelog
+* Tue Aug 04 2009 Jan Pazdziora 0.6.17-1
+- Bump up the version to 0.6, in preparation for Spacewalk 0.6
+
* Wed Jul 29 2009 John Matthews <jmatthew(a)redhat.com> 0.6.16-1
- 512440 - SetHandler to none to allow ProxyPass on /cobbler* and /cblr to
work. (jpazdziora(a)redhat.com)
14 years, 8 months
Changes to 'refs/tags/osad-5.9.21-1'
by Jan Pazdziora
Tag 'osad-5.9.21-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-08-04 06:50 +0000
Tagging package [osad] version [5.9.21-1] in directory [client/tools/osad/].
Changes since ProgAGoGo-1.11.6-1:
Jan Pazdziora (1):
Automatic commit of package [osad] release [5.9.21-1].
---
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
---
14 years, 8 months
client/tools rel-eng/packages
by Jan Pazdziora
client/tools/osad/osad.spec | 5 ++++-
rel-eng/packages/osad | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit cec014ac1c961366ef4bd7ab6a113c1eb2e96fb1
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 4 08:50:37 2009 +0200
Automatic commit of package [osad] release [5.9.21-1].
diff --git a/client/tools/osad/osad.spec b/client/tools/osad/osad.spec
index 3919fa4..fd9b0af 100644
--- a/client/tools/osad/osad.spec
+++ b/client/tools/osad/osad.spec
@@ -9,7 +9,7 @@ Group: System Environment/Daemons
License: GPLv2
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
-Version: 5.9.20
+Version: 5.9.21
Release: 1%{?dist}
BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
BuildArch: noarch
@@ -236,6 +236,9 @@ rpm -ql osa-dispatcher | xargs -n 1 /sbin/restorecon -rvvi {}
# $Id$
%changelog
+* Tue Aug 04 2009 Jan Pazdziora 5.9.21-1
+- 514320 - open the pid file with append
+
* Mon Jul 27 2009 John Matthews <jmatthew(a)redhat.com> 5.9.20-1
- 512732 - on Fedora 12, it will be just and corenet_udp_bind_generic_node and
corenet_udp_bind_all_nodes. (jpazdziora(a)redhat.com)
diff --git a/rel-eng/packages/osad b/rel-eng/packages/osad
index 1121e4e..bb7e89c 100644
--- a/rel-eng/packages/osad
+++ b/rel-eng/packages/osad
@@ -1 +1 @@
-5.9.20-1 client/tools/osad/
+5.9.21-1 client/tools/osad/
14 years, 8 months
Changes to 'refs/tags/ProgAGoGo-1.11.6-1'
by Jan Pazdziora
Tag 'ProgAGoGo-1.11.6-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2009-08-04 06:49 +0000
Tagging package [ProgAGoGo] version [1.11.6-1] in directory [monitoring/ProgAGoGo/].
Changes since spacewalk-setup-0.6.17-1:
Jan Pazdziora (3):
514320 - on F10, write_files_pattern does not give us write.
Bump up the version to 0.6, in preparation for Spacewalk 0.6.
Automatic commit of package [ProgAGoGo] release [1.11.6-1].
Joshua Roys (2):
Patch: Selinux Context support for config files
upgrade script for the previous commit. Patch from Joshua Roys
Justin Sherrill (24):
initial yum repo sync schema and UI work
adding sync repo option to UI for yum repos
merge conflict
backend/satellite_tools/repo_plugins/yum_src.py
adding label to ContentSource schema
adding repo sync task and other UI bits for spacewalk repo sync
adding logging, cache clearing, and a few fixes to reposync
adding sync repo option to channel details, and taskomatic task
fixing some import things to actually work on an installed system
making the logging a bit cleaner
updating task to include log file and more logging
some repo sync task fixes
check style fixes
496080 - fixing issue where if the rhn tools beta channel was synced, you would get an ISE when trying to give the virt entitlement within an org that did not have access to that channel
adding better logging for spacewalk-repo-sync
fixing small whitespace error with reposync
fixing specfile to create directory for reposync
fixing small method call in reposync
adding newline to error message output
merge conflict
moving three new tables for postgres merge
Merge branch 'master' into repo-sync
fixing small typo in upgrade script names
adding last_boot to system.getDetails() api call, per user request
Partha Aji (1):
514291 - Fix to properly schedule ssm ks over IP range
Pradeep Kilambi (6):
some clean up on repo sync stuff
updating Makefile with reposync files
updating spacewalk backend spec file with reposync stuff
adding makefile to repo_plugins
515219 - We can have a channel with null description. In the packagedetailsaction we call replace on description without checking if its a valid string resulting in Null Pointer Exception.
client tools merge from svn
Shannon Hughes (2):
514792 - fix spelling error for form var on jsp page
514994 - added logic to keep channel family name lengh at 128 or lower
---
backend/Makefile.backend | 2
backend/satellite_tools/Makefile | 6
backend/satellite_tools/repo_plugins/Makefile | 27 +
backend/satellite_tools/repo_plugins/__init__.py | 15
backend/satellite_tools/repo_plugins/yum_src.py | 64 ++
backend/satellite_tools/reposync.py | 244 ++++++++++
backend/satellite_tools/spacewalk-debug.8 | 20
backend/satellite_tools/spacewalk-repo-sync | 79 +++
backend/server/Makefile | 4
backend/server/action/configfiles.py | 3
backend/server/basePackageUpload.py | 100 ++++
backend/server/configFilesHandler.py | 1
backend/server/handlers/config/rhn_config_management.py | 3
backend/server/handlers/config_mgmt/rhn_config_management.py | 6
backend/server/rhnPackage.py | 16
backend/server/rhnPackageUpload.py | 71 --
backend/spacewalk-backend.spec | 7
backend/upload_server/handlers/package_push/package_push.py | 10
backend/upload_server/handlers/package_upload/package_upload.py | 8
client/rhel/rhn-client-tools/rhn-client-tools.spec | 9
client/rhel/rhn-client-tools/src/firstboot/rhn_activate_gui.py | 2
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 1
client/rhel/yum-rhn-plugin/yum-rhn-plugin.spec | 15
client/tools/osad/src/jabber_lib.py | 2
client/tools/rhncfg/config_common/transactions.py | 20
client/tools/rhncfg/rhncfg.spec | 1
java/buildconf/builder/config/satellite/rhn.conf | 2
java/code/src/com/redhat/rhn/common/conf/ConfigDefaults.java | 3
java/code/src/com/redhat/rhn/common/db/datasource/xml/Channel_queries.xml | 6
java/code/src/com/redhat/rhn/common/db/datasource/xml/config_queries.xml | 4
java/code/src/com/redhat/rhn/domain/channel/Channel.hbm.xml | 8
java/code/src/com/redhat/rhn/domain/channel/Channel.java | 51 ++
java/code/src/com/redhat/rhn/domain/channel/ChannelFactory.java | 40 +
java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java | 10
java/code/src/com/redhat/rhn/domain/channel/ContentSource.hbm.xml | 41 +
java/code/src/com/redhat/rhn/domain/channel/ContentSource.java | 131 +++++
java/code/src/com/redhat/rhn/domain/channel/ContentSourceType.hbm.xml | 26 +
java/code/src/com/redhat/rhn/domain/channel/ContentSourceType.java | 59 ++
java/code/src/com/redhat/rhn/domain/channel/test/ChannelTest.java | 14
java/code/src/com/redhat/rhn/domain/config/ConfigInfo.hbm.xml | 1
java/code/src/com/redhat/rhn/domain/config/ConfigInfo.java | 17
java/code/src/com/redhat/rhn/domain/config/ConfigurationFactory.java | 19
java/code/src/com/redhat/rhn/domain/config/test/ConfigurationFactoryTest.java | 4
java/code/src/com/redhat/rhn/domain/task/Task.hbm.xml | 8
java/code/src/com/redhat/rhn/domain/task/TaskFactory.java | 29 +
java/code/src/com/redhat/rhn/frontend/action/channel/manage/EditChannelAction.java | 30 +
java/code/src/com/redhat/rhn/frontend/action/configuration/ConfigFileForm.java | 3
java/code/src/com/redhat/rhn/frontend/action/configuration/validation/configFileForm.xsd | 6
java/code/src/com/redhat/rhn/frontend/action/rhnpackage/PackageDetailsAction.java | 11
java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml | 3
java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml | 28 -
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/ConfigChannelHandler.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/configchannel/XmlRpcConfigChannelHelper.java | 1
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ConfigRevisionSerializer.java | 2
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java | 4
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/config/ServerConfigHandler.java | 1
java/code/src/com/redhat/rhn/manager/channel/CreateChannelCommand.java | 46 +
java/code/src/com/redhat/rhn/manager/channel/UpdateChannelCommand.java | 8
java/code/src/com/redhat/rhn/manager/configuration/file/ConfigFileData.java | 32 +
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 15
java/code/src/com/redhat/rhn/taskomatic/task/RepoSyncTask.java | 114 ++++
java/code/src/com/redhat/rhn/testing/ConfigTestUtils.java | 2
java/code/webapp/WEB-INF/pages/channel/manage/confirmprivate.jsp | 2
java/code/webapp/WEB-INF/pages/channel/manage/confirmprotected.jsp | 2
java/code/webapp/WEB-INF/pages/channel/manage/edit.jsp | 39 +
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/create.jspf | 5
java/code/webapp/WEB-INF/pages/common/fragments/configuration/channel/upload.jspf | 5
java/code/webapp/WEB-INF/pages/common/fragments/configuration/files/properties.jspf | 15
java/code/webapp/WEB-INF/struts-config.xml | 4
monitoring/ProgAGoGo/ProgAGoGo.spec | 5
rel-eng/packages/ProgAGoGo | 2
schema/spacewalk/common/tables/rhnChannelContentSource.sql | 61 ++
schema/spacewalk/common/tables/rhnConfigInfo.sql | 23
schema/spacewalk/common/tables/rhnContentSourceType.sql | 48 +
schema/spacewalk/common/tables/rhnContentSourceType_data.sql | 21
schema/spacewalk/oracle/procs/lookup_config_info.sql | 10
schema/spacewalk/postgres/procs/lookup_config_info.sql | 10
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/150-rhnConfigInfo_selinux.sql | 48 +
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/191-rhnContentSourceType.sql | 46 +
schema/spacewalk/upgrade/spacewalk-schema-0.5-to-spacewalk-schema-0.6/192-rhnChannelContentSource.sql | 57 ++
web/conf/rhn_web.conf | 2
81 files changed, 1749 insertions(+), 172 deletions(-)
---
14 years, 8 months
monitoring/ProgAGoGo rel-eng/packages
by Jan Pazdziora
monitoring/ProgAGoGo/ProgAGoGo.spec | 5 ++++-
rel-eng/packages/ProgAGoGo | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit ff2b62c036a7f8cde258c44d69d457bcc5606c15
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Aug 4 08:49:36 2009 +0200
Automatic commit of package [ProgAGoGo] release [1.11.6-1].
diff --git a/monitoring/ProgAGoGo/ProgAGoGo.spec b/monitoring/ProgAGoGo/ProgAGoGo.spec
index 7c31275..f8e8139 100644
--- a/monitoring/ProgAGoGo/ProgAGoGo.spec
+++ b/monitoring/ProgAGoGo/ProgAGoGo.spec
@@ -1,5 +1,5 @@
Name: ProgAGoGo
-Version: 1.11.5
+Version: 1.11.6
Release: 1%{?dist}
Summary: Program exec''er/respawner
URL: https://fedorahosted.org/spacewalk
@@ -33,6 +33,9 @@ install -m 755 gogo.pl $RPM_BUILD_ROOT/%{_bindir}
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Aug 04 2009 Jan Pazdziora 1.11.6-1
+- 513368 - call setpgrp to prevent kill 0 to propagate to jabberd and tomcat
+
* Tue Feb 10 2009 Jan Pazdziora 1.11.5-1
- gogo.pl: add a missing semicolon
diff --git a/rel-eng/packages/ProgAGoGo b/rel-eng/packages/ProgAGoGo
index a548821..2da218a 100644
--- a/rel-eng/packages/ProgAGoGo
+++ b/rel-eng/packages/ProgAGoGo
@@ -1 +1 @@
-1.11.5-1 monitoring/ProgAGoGo/
+1.11.6-1 monitoring/ProgAGoGo/
14 years, 8 months
java/code
by Partha Aji
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 15 ++++------
1 file changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 2941f0602801239ae7261a6e1b857516bd5b6eb3
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Aug 3 19:43:45 2009 -0400
514291 - Fix to properly schedule ssm ks over IP range
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index 9a56201..f6391d2 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -934,9 +934,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
* @return extraOptions that will be appended to the Kickstart.
*/
public String getExtraOptions() {
- if (isCobblerOnly()) {
- return StringUtils.defaultString(kernelOptions);
- }
StringBuilder retval = new StringBuilder();
String kOptions = StringUtils.defaultString(kernelOptions);
/** Some examples:
@@ -1393,9 +1390,11 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
* @param networkInterfaceIn The staticDevice to set.
*/
public void setNetworkDevice(String networkType, String networkInterfaceIn) {
- isDhcp = networkType.equals(DHCP_NETWORK_TYPE) ||
- networkType.equals(LINK_NETWORK_TYPE);
- if (networkType.equals(LINK_NETWORK_TYPE)) {
+ isDhcp = DHCP_NETWORK_TYPE.equals(networkType) ||
+ StringUtils.isBlank(networkType) ||
+ LINK_NETWORK_TYPE.equals(networkType);
+ if (StringUtils.isBlank(networkType) ||
+ networkType.equals(LINK_NETWORK_TYPE)) {
networkInterface = LINK_NETWORK_TYPE;
}
else {
@@ -1468,8 +1467,8 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
}
private ValidatorError validateNetworkInterface() {
- if (!StringUtils.isEmpty(networkInterface) &&
- !(isDhcp && "link".equals(networkInterface))) {
+
+ if (!LINK_NETWORK_TYPE.equals(networkInterface)) {
boolean nicAvailable = false;
for (NetworkInterface nic : server.getNetworkInterfaces()) {
if (networkInterface.equals(nic.getName())) {
14 years, 8 months
Branch 'VADER' - 2 commits - java/code
by Partha Aji
java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java | 13 ++++------
java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp | 2 -
2 files changed, 7 insertions(+), 8 deletions(-)
New commits:
commit 15e3be8cc264f2ce9db9c87bc67640ad12bca900
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Aug 3 19:43:45 2009 -0400
514291 - Fix to properly schedule ssm ks over IP range
diff --git a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
index 5217dcb..c7e74f0 100644
--- a/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
+++ b/java/code/src/com/redhat/rhn/manager/kickstart/KickstartScheduleCommand.java
@@ -934,9 +934,6 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
* @return extraOptions that will be appended to the Kickstart.
*/
public String getExtraOptions() {
- if (isCobblerOnly()) {
- return StringUtils.defaultString(kernelOptions);
- }
StringBuilder retval = new StringBuilder();
String kOptions = StringUtils.defaultString(kernelOptions);
/** Some examples:
@@ -1393,9 +1390,11 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
* @param networkInterfaceIn The staticDevice to set.
*/
public void setNetworkDevice(String networkType, String networkInterfaceIn) {
- isDhcp = networkType.equals(DHCP_NETWORK_TYPE) ||
- networkType.equals(LINK_NETWORK_TYPE);
- if (networkType.equals(LINK_NETWORK_TYPE)) {
+ isDhcp = DHCP_NETWORK_TYPE.equals(networkType) ||
+ StringUtils.isBlank(networkType) ||
+ LINK_NETWORK_TYPE.equals(networkType);
+ if (StringUtils.isBlank(networkType) ||
+ networkType.equals(LINK_NETWORK_TYPE)) {
networkInterface = LINK_NETWORK_TYPE;
}
else {
@@ -1468,7 +1467,7 @@ public class KickstartScheduleCommand extends BaseSystemOperation {
}
private ValidatorError validateNetworkInterface() {
- if (!StringUtils.isEmpty(networkInterface)) {
+ if (!LINK_NETWORK_TYPE.equals(networkInterface)) {
boolean nicAvailable = false;
for (NetworkInterface nic : server.getNetworkInterfaces()) {
if (networkInterface.equals(nic.getName())) {
commit 13d0c9708e999800b7b10e89e2e0c76ec1bb4c5d
Author: Partha Aji <paji(a)redhat.com>
Date: Mon Aug 3 19:38:42 2009 -0400
Validation errors on advanced ks page were ignored...
As in the Advanced KS Schedule page.. Fixed it..
diff --git a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
index 7813b05..91099ea 100644
--- a/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
+++ b/java/code/webapp/WEB-INF/pages/kickstart/wizard/schedule/first.jsp
@@ -22,7 +22,7 @@ function setStep(stepName) {
</head>
<body>
-
+<html:errors />
<%@ include file="/WEB-INF/pages/common/fragments/systems/system-header.jspf" %>
<br />
14 years, 8 months
java/code
by Justin Sherrill
java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
New commits:
commit 2bc9f8a0024f8d4f9cdd7595e9f19f6502a09eae
Author: Justin Sherrill <jlsherri(a)justin-sherrills-macbook-2.local>
Date: Mon Aug 3 17:02:08 2009 -0400
adding last_boot to system.getDetails() api call, per user request
diff --git a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
index 5998f3d..e54ee44 100644
--- a/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
+++ b/java/code/src/com/redhat/rhn/frontend/xmlrpc/serializer/ServerSerializer.java
@@ -63,7 +63,8 @@ import redstone.xmlrpc.XmlRpcSerializer;
* #prop("string", "room")
* #prop("string", "rack")
* #prop("string", "description")
- * #prop("string", "hostname")
+ * #prop("string", "hostname")
+ * #prop($date, "last_boot")
* #prop_desc("string", "osa_status", "Either 'unknown', 'offline', or 'online'.")
* #prop_desc("boolean", "lock_status", "True indicates that the system is locked.
* False indicates that the system is unlocked.")
@@ -159,6 +160,7 @@ public class ServerSerializer implements XmlRpcCustomSerializer {
helper.add("rack", rack);
helper.add("release", server.getRelease());
+ helper.add("last_boot", server.getLastBootAsDate());
if (server.getPushClient() != null) {
helper.add("osa_status", server.getPushClient().getState().getName());
14 years, 9 months
java/code
by Shannon Hughes
java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
New commits:
commit 7aa17635fcc19dca39a156bbfbe83fdcbe55d16b
Author: Shannon Hughes <shughes(a)redhat.com>
Date: Mon Aug 3 16:28:42 2009 -0400
514994 - added logic to keep channel family name lengh at 128 or lower
diff --git a/java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java b/java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java
index 29bde86..5b1d270 100644
--- a/java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java
+++ b/java/code/src/com/redhat/rhn/domain/channel/ChannelFamilyFactory.java
@@ -108,7 +108,15 @@ public class ChannelFamilyFactory extends HibernateFactory {
if (cfam == null) {
String label = "private-channel-family-" + orgIn.getId();
- String name = orgIn.getName() + " (" + orgIn.getId() + ") Channel Family";
+ String suffix = " (" + orgIn.getId() + ") Channel Family";
+ String prefix = orgIn.getName();
+ int len = prefix.length() + suffix.length();
+ if (len > 128) {
+ int diff = len - 128;
+ prefix = prefix.substring(1, prefix.length() - diff);
+ }
+
+ String name = prefix.concat(suffix);
cfam = new ChannelFamily();
cfam.setOrg(orgIn);
14 years, 9 months