rel-eng/packages schema/spacewalk
by Michael Mraka
rel-eng/packages/spacewalk-schema | 2 +-
schema/spacewalk/spacewalk-schema.spec | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
New commits:
commit 335adee8b24ce3411b2c8f0eed39054e097978b5
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 22 15:10:46 2011 +0100
Automatic commit of package [spacewalk-schema] release [1.4.3-1].
diff --git a/rel-eng/packages/spacewalk-schema b/rel-eng/packages/spacewalk-schema
index 5d23d62..464a7ff 100644
--- a/rel-eng/packages/spacewalk-schema
+++ b/rel-eng/packages/spacewalk-schema
@@ -1 +1 @@
-1.4.2-1 schema/spacewalk/
+1.4.3-1 schema/spacewalk/
diff --git a/schema/spacewalk/spacewalk-schema.spec b/schema/spacewalk/spacewalk-schema.spec
index c96a667..8547dda 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.4.2
+Version: 1.4.3
Release: 1%{?dist}
Source0: %{name}-%{version}.tar.gz
@@ -66,6 +66,11 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man1/spacewalk-sql*
%changelog
+* Tue Feb 22 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.3-1
+- removed unused rhn_sat_node_probe table
+- rhn_synch_probe_state doesn't depend on rhn_satellite_state
+- removed unused table web_customer_notification
+
* Fri Feb 18 2011 Jan Pazdziora 1.4.2-1
- Make the index on rhnActionErrataUpdate (action_id, errata_id) unique.
13 years, 3 months
3 commits - schema/spacewalk
by Michael Mraka
schema/spacewalk/common/tables/rhn_sat_node_probe.sql | 46 -----------
schema/spacewalk/common/tables/tables.deps | 1
schema/spacewalk/common/tables/web_customer_notification.sql | 33 -------
schema/spacewalk/oracle/procs/procs.deps | 2
schema/spacewalk/oracle/synonyms/sat_node_probe.sql | 28 ------
schema/spacewalk/postgres/procs/procs.deps | 2
6 files changed, 2 insertions(+), 110 deletions(-)
New commits:
commit 7ff8f35fef298b06120c08610ae97313bed0de78
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 22 14:11:44 2011 +0100
removed unused rhn_sat_node_probe table
diff --git a/schema/spacewalk/common/tables/rhn_sat_node_probe.sql b/schema/spacewalk/common/tables/rhn_sat_node_probe.sql
deleted file mode 100644
index 5493490..0000000
--- a/schema/spacewalk/common/tables/rhn_sat_node_probe.sql
+++ /dev/null
@@ -1,46 +0,0 @@
---
--- Copyright (c) 2008--2010 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
-
-
-CREATE TABLE rhn_sat_node_probe
-(
- probe_id NUMBER(12) NOT NULL
- CONSTRAINT rhn_sndpb_probe_id_pk PRIMARY KEY
- USING INDEX TABLESPACE [[2m_tbs]],
- probe_type VARCHAR2(12)
- DEFAULT ('satnode') NOT NULL
- CONSTRAINT rhn_sndpb_probe_type_ck
- CHECK (probe_type='satnode'),
- sat_node_id NUMBER(12) NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-
-COMMENT ON TABLE rhn_sat_node_probe IS 'sndpb satellite node probe definitions';
-
-CREATE INDEX rhn_sndpb_sat_node_id_idx
- ON rhn_sat_node_probe (sat_node_id)
- TABLESPACE [[2m_tbs]];
-
-ALTER TABLE rhn_sat_node_probe
- ADD CONSTRAINT rhn_sndpb_pr_recid_pr_typ_fk FOREIGN KEY (probe_id, probe_type)
- REFERENCES rhn_probe (recid, probe_type)
- ON DELETE CASCADE;
-
-ALTER TABLE rhn_sat_node_probe
- ADD CONSTRAINT rhn_sndpb_satnd_sat_nd_id_fk FOREIGN KEY (sat_node_id)
- REFERENCES rhn_sat_node (recid)
- ON DELETE CASCADE;
-
diff --git a/schema/spacewalk/common/tables/tables.deps b/schema/spacewalk/common/tables/tables.deps
index 85e9e53..c18f582 100644
--- a/schema/spacewalk/common/tables/tables.deps
+++ b/schema/spacewalk/common/tables/tables.deps
@@ -242,7 +242,6 @@ rhn_redirects :: web_contact web_customer rhn_redirect_types
rhn_sat_cluster :: rhn_command_target web_customer rhn_physical_location
rhn_sat_cluster_probe :: rhn_probe rhn_sat_cluster
rhn_sat_node :: rhn_command_target rhn_sat_cluster
-rhn_sat_node_probe :: rhn_probe rhn_sat_node
rhn_schedule_days :: rhn_schedules
rhn_schedules :: web_customer rhn_schedule_types
rhn_schedule_weeks :: rhn_schedules
diff --git a/schema/spacewalk/oracle/synonyms/sat_node_probe.sql b/schema/spacewalk/oracle/synonyms/sat_node_probe.sql
deleted file mode 100644
index 6d86c7c..0000000
--- a/schema/spacewalk/oracle/synonyms/sat_node_probe.sql
+++ /dev/null
@@ -1,28 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
---
---
---
-
---create special sat_node_probe synonyms for monitoring backend code to function as is
-
-create or replace synonym sat_node_probe for rhn_sat_node_probe;
-
---
---
---Revision 1.1 2004/06/23 15:01:07 kja
---bugzilla 126465 -- fix synonyms for monitoring backend
---
---
commit 0b33abcfc1d53e97fb1ecde872da1833150e8607
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 22 14:03:39 2011 +0100
rhn_synch_probe_state doesn't depend on rhn_satellite_state
diff --git a/schema/spacewalk/oracle/procs/procs.deps b/schema/spacewalk/oracle/procs/procs.deps
index ae75ee2..debe0be 100644
--- a/schema/spacewalk/oracle/procs/procs.deps
+++ b/schema/spacewalk/oracle/procs/procs.deps
@@ -116,7 +116,7 @@ rhn_install_satellite :: rhn_command_queue_instances rhn_sat_cluster \
rhn_prepare_install :: rhn_command_queue_instances
rhn_synch_probe_state :: rhn_probe_state rhn_deployed_probe \
rhn_current_state_summaries \
- rhn_multi_scout_threshold rhn_satellite_state \
+ rhn_multi_scout_threshold \
rhn_current_state_summaries
set_ks_session_history_message :: rhnKickstartSessionState \
rhnKickstartSessionHistory
diff --git a/schema/spacewalk/postgres/procs/procs.deps b/schema/spacewalk/postgres/procs/procs.deps
index 84aeead..4166cf0 100644
--- a/schema/spacewalk/postgres/procs/procs.deps
+++ b/schema/spacewalk/postgres/procs/procs.deps
@@ -114,7 +114,7 @@ rhn_install_satellite :: rhn_command_queue_instances rhn_sat_cluster \
rhn_prepare_install :: rhn_command_queue_instances
rhn_synch_probe_state :: rhn_probe_state rhn_deployed_probe \
rhn_current_state_summaries \
- rhn_multi_scout_threshold rhn_satellite_state \
+ rhn_multi_scout_threshold \
rhn_current_state_summaries
set_ks_session_history_message :: rhnKickstartSessionState \
rhnKickstartSessionHistory
commit 1f99852ff5d793d12127dfbd38f26c04a6e12e42
Author: Michael Mraka <michael.mraka(a)redhat.com>
Date: Tue Feb 22 13:48:04 2011 +0100
removed unused table
diff --git a/schema/spacewalk/common/tables/web_customer_notification.sql b/schema/spacewalk/common/tables/web_customer_notification.sql
deleted file mode 100644
index 4325308..0000000
--- a/schema/spacewalk/common/tables/web_customer_notification.sql
+++ /dev/null
@@ -1,33 +0,0 @@
---
--- Copyright (c) 2008 Red Hat, Inc.
---
--- This software is licensed to you under the GNU General Public License,
--- version 2 (GPLv2). There is NO WARRANTY for this software, express or
--- implied, including the implied warranties of MERCHANTABILITY or FITNESS
--- FOR A PARTICULAR PURPOSE. You should have received a copy of GPLv2
--- along with this software; if not, see
--- http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt.
---
--- Red Hat trademarks are not licensed under GPLv2. No permission is
--- granted to use or replicate Red Hat trademarks that are incorporated
--- in this software or its documentation.
---
-
-
-CREATE TABLE web_customer_notification
-(
- id NUMBER NOT NULL
- CONSTRAINT web_cust_not_id_pk PRIMARY KEY
- USING INDEX TABLESPACE [[64k_tbs]],
- org_id NUMBER NOT NULL
- CONSTRAINT web_cust_not_oid_fk
- REFERENCES web_customer (id)
- ON DELETE CASCADE,
- contact_email_address VARCHAR2(150) NOT NULL,
- creation_date DATE NOT NULL
-)
-ENABLE ROW MOVEMENT
-;
-
-CREATE SEQUENCE web_cust_notif_seq START WITH 1000000;
-
13 years, 3 months
Changes to 'refs/tags/spacewalk-java-1.4.8-1'
by Tomas Lestach
Tag 'spacewalk-java-1.4.8-1' created by Tomas Lestach <tlestach(a)redhat.com> at 2011-02-22 10:43 +0000
Tagging package [spacewalk-java] version [1.4.8-1] in directory [java/].
Changes since SatConfig-general-1.216.21-1:
Tomas Lestach (2):
replace jasper5 with tomcat6-lib for tomcat6
Automatic commit of package [spacewalk-java] release [1.4.8-1].
---
java/spacewalk-java.spec | 15 ++++++++++++---
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 13 insertions(+), 4 deletions(-)
---
13 years, 3 months
2 commits - java/spacewalk-java.spec rel-eng/packages
by Tomas Lestach
java/spacewalk-java.spec | 15 ++++++++++++---
rel-eng/packages/spacewalk-java | 2 +-
2 files changed, 13 insertions(+), 4 deletions(-)
New commits:
commit 5f8f5ea96c84a270091647accaf62d0953f8d2fc
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Tue Feb 22 11:43:38 2011 +0100
Automatic commit of package [spacewalk-java] release [1.4.8-1].
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 19bbdcf..03b1908 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.7
+Version: 1.4.8
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -536,6 +536,13 @@ fi
%{jardir}/postgresql-jdbc.jar
%changelog
+* Tue Feb 22 2011 Tomas Lestach <tlestach(a)redhat.com> 1.4.8-1
+- replace jasper5 with tomcat6-lib for tomcat6 (tlestach(a)redhat.com)
+- removing dead code (tlestach(a)redhat.com)
+- selectedChannel is always null at this place (tlestach(a)redhat.com)
+- fix CreateCommandTest.testVerifyChannelName test (tlestach(a)redhat.com)
+- fix SystemHandlerTest.testGetSubscribedBaseChannel test (tlestach(a)redhat.com)
+
* Mon Feb 21 2011 Jan Pazdziora 1.4.7-1
- Typo in the log message (luc(a)delouw.ch)
- fix testGetSubscribedBaseChannel test (tlestach(a)redhat.com)
diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java
index 13c4c75..3ed44a1 100644
--- a/rel-eng/packages/spacewalk-java
+++ b/rel-eng/packages/spacewalk-java
@@ -1 +1 @@
-1.4.7-1 java/
+1.4.8-1 java/
commit 25189cb14c5e5f6141a4dc16df73c58967a9a694
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 21 18:37:01 2011 +0100
replace jasper5 with tomcat6-lib for tomcat6
diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec
index 7f265af..19bbdcf 100644
--- a/java/spacewalk-java.spec
+++ b/java/spacewalk-java.spec
@@ -53,7 +53,6 @@ Requires: jakarta-commons-cli
Requires: jakarta-commons-el
Requires: jakarta-commons-io
Requires: jakarta-taglibs-standard
-Requires: jasper5
Requires: jcommon
Requires: jpam
Requires: jta
@@ -64,9 +63,11 @@ Requires: servletapi5
# EL5/F12 = Struts 1.2 and Tomcat 5, EL6+/F13+ = 1.3 and 6
%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} < 13)
Requires: tomcat5
+Requires: jasper5
Requires: struts >= 0:1.2.9
%else
Requires: tomcat6
+Requires: tomcat6-lib
Requires: struts >= 0:1.3.0
Requires: struts-taglib >= 0:1.3.0
%endif
@@ -120,7 +121,6 @@ BuildRequires: jakarta-commons-fileupload
BuildRequires: jakarta-commons-io
BuildRequires: jakarta-commons-validator
BuildRequires: jakarta-taglibs-standard
-BuildRequires: jasper5
BuildRequires: jcommon
BuildRequires: jdom
BuildRequires: jfreechart >= 0:1.0.9
@@ -134,10 +134,12 @@ BuildRequires: stringtree-json
%if (0%{?rhel} && 0%{?rhel} < 6) || (0%{?fedora} && 0%{?fedora} < 13)
BuildRequires: struts >= 0:1.2.9
BuildRequires: jsp
+BuildRequires: jasper5
%else
BuildRequires: struts >= 0:1.3.0
BuildRequires: struts-taglib >= 0:1.3.0
BuildRequires: tomcat6
+BuildRequires: tomcat6-lib
%endif
BuildRequires: sitemesh
BuildRequires: postgresql-jdbc
13 years, 3 months
Changes to 'refs/tags/SatConfig-general-1.216.21-1'
by Jan Pazdziora
Tag 'SatConfig-general-1.216.21-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-02-22 08:30 +0000
Tagging package [SatConfig-general] version [1.216.21-1] in directory [monitoring/SatConfig/general/].
Changes since spacewalk-java-1.4.7-1:
Jan Pazdziora (3):
The module Text::Diff is no longer needed, removing its use.
Fixing typo (missing single-quote).
Automatic commit of package [SatConfig-general] release [1.216.21-1].
Milan Zazrivec (1):
662593 - let osad initiate presence subscription
Miroslav Suchý (1):
we need yum-rhn-plugin in server repo as well.
Tomas Lestach (4):
fix SystemHandlerTest.testGetSubscribedBaseChannel test
fix CreateCommandTest.testVerifyChannelName test
selectedChannel is always null at this place
removing dead code
---
client/tools/osad/src/osa_dispatcher.py | 1 -
java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java | 7 +------
java/code/src/com/redhat/rhn/frontend/xmlrpc/system/test/SystemHandlerTest.java | 7 ++++---
java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java | 2 +-
monitoring/SatConfig/general/SatConfig-general.spec | 5 ++++-
monitoring/SatConfig/general/SysVStep.pm | 2 +-
rel-eng/comps/comps-spacewalk-server-fedora13.xml | 1 +
rel-eng/comps/comps-spacewalk-server-fedora14.xml | 1 +
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 +
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 +
rel-eng/packages/SatConfig-general | 2 +-
web/modules/rhn/RHN/DB/ConfigRevision.pm | 1 -
12 files changed, 16 insertions(+), 15 deletions(-)
---
13 years, 3 months
monitoring/SatConfig rel-eng/packages
by Jan Pazdziora
monitoring/SatConfig/general/SatConfig-general.spec | 5 ++++-
rel-eng/packages/SatConfig-general | 2 +-
2 files changed, 5 insertions(+), 2 deletions(-)
New commits:
commit a51acf9a4f27a38b5576b419318594b5ca652127
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Feb 22 09:30:43 2011 +0100
Automatic commit of package [SatConfig-general] release [1.216.21-1].
diff --git a/monitoring/SatConfig/general/SatConfig-general.spec b/monitoring/SatConfig/general/SatConfig-general.spec
index 2cda8a3..fc4a372 100644
--- a/monitoring/SatConfig/general/SatConfig-general.spec
+++ b/monitoring/SatConfig/general/SatConfig-general.spec
@@ -2,7 +2,7 @@
%define hb_res_dir %{_sysconfdir}/ha.d/resource.d
%define installed_dir %sysv_dir/installed
Name: SatConfig-general
-Version: 1.216.20
+Version: 1.216.21
Release: 1%{?dist}
Summary: Satellite Configuration System - general setup, used by many packages
URL: https://fedorahosted.org/spacewalk
@@ -65,6 +65,9 @@ install -D -p -m 755 NOCpulse-ini $RPM_BUILD_ROOT%{_sbindir}/NOCpulse-ini
rm -rf $RPM_BUILD_ROOT
%changelog
+* Tue Feb 22 2011 Jan Pazdziora 1.216.21-1
+- Fixing typo (missing single-quote).
+
* Fri Feb 18 2011 Jan Pazdziora 1.216.20-1
- Localize the filehandle globs; also use three-parameter opens.
diff --git a/rel-eng/packages/SatConfig-general b/rel-eng/packages/SatConfig-general
index 5fb5b1a..870e474 100644
--- a/rel-eng/packages/SatConfig-general
+++ b/rel-eng/packages/SatConfig-general
@@ -1 +1 @@
-1.216.20-1 monitoring/SatConfig/general/
+1.216.21-1 monitoring/SatConfig/general/
13 years, 3 months
monitoring/SatConfig
by Jan Pazdziora
monitoring/SatConfig/general/SysVStep.pm | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
New commits:
commit e14719237f4dd26db56588fefc9f8d1801e19d84
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Feb 22 09:24:14 2011 +0100
Fixing typo (missing single-quote).
Bug introduced by cb638ba72a893e872da251668a9963c9d87d6f59.
diff --git a/monitoring/SatConfig/general/SysVStep.pm b/monitoring/SatConfig/general/SysVStep.pm
index 9b1713f..c93f43d 100644
--- a/monitoring/SatConfig/general/SysVStep.pm
+++ b/monitoring/SatConfig/general/SysVStep.pm
@@ -295,7 +295,7 @@ sub startStep
if ($is_not_subsystem) {
# This is for RH "rc" script - won't kill if this isn't here
local * FILE;
- open(FILE, '>', /var/lock/subsys/'.ref($self));
+ open(FILE, '>', '/var/lock/subsys/'.ref($self));
print FILE 'running';
close(FILE);
}
13 years, 3 months
client/tools
by Milan Zazrivec
client/tools/osad/src/osa_dispatcher.py | 1 -
1 file changed, 1 deletion(-)
New commits:
commit 2ca8629f4d2bd681bd1db48b4672059fb1cdc653
Author: Milan Zazrivec <mzazrivec(a)redhat.com>
Date: Mon Feb 21 18:27:17 2011 +0100
662593 - let osad initiate presence subscription
diff --git a/client/tools/osad/src/osa_dispatcher.py b/client/tools/osad/src/osa_dispatcher.py
index 3595717..7d96db7 100644
--- a/client/tools/osad/src/osa_dispatcher.py
+++ b/client/tools/osad/src/osa_dispatcher.py
@@ -110,7 +110,6 @@ class Runner(jabber_lib.Runner):
client_jids = self._get_client_jids()
client_jids = map(lambda x: x[0], client_jids)
- c.subscribe_to_presence(client_jids)
# Unsubscribe the dispatcher from any client jid that no longer exists
self.cleanup_roster(c, client_jids)
13 years, 3 months
3 commits - java/code
by Tomas Lestach
java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java | 7 +------
java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java | 2 +-
2 files changed, 2 insertions(+), 7 deletions(-)
New commits:
commit 93d09aa0f827faf2c6a93a8109c1ef2cdebc2deb
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 21 18:09:50 2011 +0100
removing dead code
selectedVersionStr is always not null at this point
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
index a0f621c..7e7deb0 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
@@ -169,10 +169,6 @@ public class AddRedHatErrataAction extends RhnListAction {
sortChannelsAndChildify(channelSet, channelList, user, selectedChannelStr);
request.setAttribute(CHANNEL_LIST, channelList);
}
- if (channelList.size() > 0 && selectedVersionStr == null) {
- selectedChannelStr = channelList.get(0).getId().toString();
- }
-
}
commit 39352f14fb1c41c3bdc8b7a2023c0eae9db10e62
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 21 18:08:54 2011 +0100
selectedChannel is always null at this place
diff --git a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
index 140fa73..a0f621c 100644
--- a/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
+++ b/java/code/src/com/redhat/rhn/frontend/action/channel/manage/AddRedHatErrataAction.java
@@ -137,8 +137,7 @@ public class AddRedHatErrataAction extends RhnListAction {
//If this is a clone, go ahead and pre-select the original Channel
Channel original = ChannelFactory.lookupOriginalChannel(currentChan);
- if (!requestContext.isSubmitted() && selectedChannel == null &&
- original != null) {
+ if (!requestContext.isSubmitted() && original != null) {
selectedChannel = original;
selectedChannelStr = selectedChannel.getId().toString();
String tmp = findVersionFromChannel(selectedChannel);
commit 5f639d6df1d18db406d16990ebf14f3c0d1530ae
Author: Tomas Lestach <tlestach(a)redhat.com>
Date: Mon Feb 21 18:21:13 2011 +0100
fix CreateCommandTest.testVerifyChannelName test
diff --git a/java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java b/java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java
index 472a2f7..93df83d 100644
--- a/java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java
+++ b/java/code/src/com/redhat/rhn/manager/channel/test/CreateCommandTest.java
@@ -64,6 +64,7 @@ public class CreateCommandTest extends RhnBaseTestCase {
invalidChannelName("rhn-channel-name");
invalidChannelName("redhat linux");
invalidChannelName("Red Hat Enterprise Spacewalk Sync");
+ invalidChannelName("0longerthansix");
// V A L I D
@@ -75,7 +76,6 @@ public class CreateCommandTest extends RhnBaseTestCase {
validChannelName("bin/channel/ok");
validChannelName("abc 123-foo/bar_under.ALPHA");
validChannelName("Jesusrs API Test Channel");
- validChannelName("0longerthansix");
// we allow the following characters but don't advertise them
// ' ( )
13 years, 3 months
rel-eng/comps
by Miroslav Suchý
rel-eng/comps/comps-spacewalk-server-fedora13.xml | 1 +
rel-eng/comps/comps-spacewalk-server-fedora14.xml | 1 +
rel-eng/comps/comps-spacewalk-server-rhel5.xml | 1 +
rel-eng/comps/comps-spacewalk-server-rhel6.xml | 1 +
4 files changed, 4 insertions(+)
New commits:
commit 63ff236a1b642e20dabfc16eb96d9bad9f06adee
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Mon Feb 21 17:20:09 2011 +0100
we need yum-rhn-plugin in server repo as well.
addressing:
--> Missing Dependency: yum-rhn-plugin >= 1.1.2-1 is needed by package rhn-check-1.4.2-1.el5.noarch
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora13.xml b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
index 4fa354e..f5228d6 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora13.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora13.xml
@@ -17,6 +17,7 @@
<packagereq type="default">rhn-setup</packagereq>
<packagereq type="default">rhn-setup-gnome</packagereq>
<packagereq type="default">rhn-client-tools</packagereq>
+ <packagereq type="default">yum-rhn-plugin</packagereq>
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">eventReceivers</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-fedora14.xml b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
index 8174f5e..fe0d2ea 100644
--- a/rel-eng/comps/comps-spacewalk-server-fedora14.xml
+++ b/rel-eng/comps/comps-spacewalk-server-fedora14.xml
@@ -17,6 +17,7 @@
<packagereq type="default">rhn-setup</packagereq>
<packagereq type="default">rhn-setup-gnome</packagereq>
<packagereq type="default">rhn-client-tools</packagereq>
+ <packagereq type="default">yum-rhn-plugin</packagereq>
<packagereq type="default">cx_Oracle</packagereq>
<packagereq type="default">eventReceivers</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel5.xml b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
index 60807d1..79e1e5a 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel5.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel5.xml
@@ -17,6 +17,7 @@
<packagereq type="default">rhn-setup</packagereq>
<packagereq type="default">rhn-setup-gnome</packagereq>
<packagereq type="default">rhn-client-tools</packagereq>
+ <packagereq type="default">yum-rhn-plugin</packagereq>
<packagereq type="default">asm</packagereq>
<packagereq type="default">bea-stax</packagereq>
diff --git a/rel-eng/comps/comps-spacewalk-server-rhel6.xml b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
index 0d08df3..d583121 100644
--- a/rel-eng/comps/comps-spacewalk-server-rhel6.xml
+++ b/rel-eng/comps/comps-spacewalk-server-rhel6.xml
@@ -17,6 +17,7 @@
<packagereq type="default">rhn-setup</packagereq>
<packagereq type="default">rhn-setup-gnome</packagereq>
<packagereq type="default">rhn-client-tools</packagereq>
+ <packagereq type="default">yum-rhn-plugin</packagereq>
<packagereq type="default">chameleon</packagereq>
<packagereq type="default">cx_Oracle</packagereq>
13 years, 3 months