spacewalk-commits March 2011

spacewalk-commits@lists.fedorahosted.org

8 participants
316 discussions

java/code
by Tomas Lestach 31 Mar '11

31 Mar '11

java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit 8585e0a20345d5be5b11d376f121d6dfc70750ff Author: Tomas Lestach <tlestach(a)redhat.com> Date: Thu Mar 31 18:22:11 2011 +0200 627791 - extending child channel selection area to 20 lines one rhn/activationkeys/channels/ChildChannels.do diff --git a/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp b/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp index 71152d7..7dee667 100644 --- a/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp +++ b/java/code/webapp/WEB-INF/pages/activationkeys/childchannels/listeditchannels.jsp @@ -25,7 +25,7 @@ <table class="details"> <tr> <td> - <select multiple="multiple" name="childChannels" size="6"> + <select multiple="multiple" name="childChannels" size="20"> <c:set var="first" scope="session" value="yes"/> <c:forEach items="${channels}" var="channel" varStatus="loop"> <c:choose>

1 0

java/code
by Tomas Lestach 31 Mar '11

31 Mar '11

java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java | 18 +++++----- 1 file changed, 10 insertions(+), 8 deletions(-) New commits: commit 08fea72e953e6e66cc9487b14a27f56585ef19b1 Author: Johannes Renner <jrenner(a)suse.de> Date: Mon Mar 28 13:45:25 2011 +0200 Do not show success message when passwords don't match diff --git a/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java b/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java index 68f6ce0..c61fbc6 100644 --- a/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java +++ b/java/code/src/com/redhat/rhn/frontend/action/user/UserEditActionHelper.java @@ -40,16 +40,18 @@ public abstract class UserEditActionHelper extends RhnAction { //get validation errors ActionErrors errors = RhnValidationHelper.validateDynaActionForm(this, form); - //Make sure password and passwordConfirm are equal + //Add an error in case of password mismatch + String pw = (String)form.get(UserActionHelper.DESIRED_PASS); + String conf = (String)form.get(UserActionHelper.DESIRED_PASS_CONFIRM); + if (!pw.equals(conf)) { + errors.add(ActionMessages.GLOBAL_MESSAGE, + new ActionMessage("error.password_mismatch")); + } + + //Make sure password is not the placeholder if (!UserActionHelper.PLACEHOLDER_PASSWORD.equals( form.get(UserActionHelper.DESIRED_PASS))) { - String pw = (String)form.get(UserActionHelper.DESIRED_PASS); - String conf = (String)form.get(UserActionHelper.DESIRED_PASS_CONFIRM); - if (!pw.equals(conf)) { - errors.add(ActionMessages.GLOBAL_MESSAGE, - new ActionMessage("error.password_mismatch")); - } - else if (errors.isEmpty()) { + if (errors.isEmpty()) { //Set the password only if there are no errors at all targetUser.setPassword(pw); }

1 0

client/rhel
by Miroslav Suchý 31 Mar '11

31 Mar '11

client/rhel/rhn-client-tools/rhn-client-tools.spec | 1 client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py | 11 ++++------ 2 files changed, 6 insertions(+), 6 deletions(-) New commits: commit 3ef12a289c1f1341144caf2af1d2595cd1500a66 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Mar 31 15:30:25 2011 +0200 691188 - inherit SSLCertificateVerifyFailedError from RepoError yum and GUI tools knows how to handle RepoError and will show nice error instead of ugly Traceback addressing: Traceback (most recent call last): File "/usr/bin/yum", line 29, in <module> yummain.user_main(sys.argv[1:], exit_code=True) File "/usr/share/yum-cli/yummain.py", line 254, in user_main errcode = main(args) File "/usr/share/yum-cli/yummain.py", line 88, in main base.getOptionsConfig(args) File "/usr/share/yum-cli/cli.py", line 192, in getOptionsConfig self.conf File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 778, in <lambda> conf = property(fget=lambda self: self._getConfig(), File "/usr/lib/python2.6/site-packages/yum/__init__.py", line 311, in _getConfig self.plugins.run('init') File "/usr/lib/python2.6/site-packages/yum/plugins.py", line 179, in run func(conduitcls(self, self.base, conf, **kwargs)) File "/usr/share/yum-plugins/rhnplugin.py", line 117, in init_hook login_info = up2dateAuth.getLoginInfo() File "/usr/share/rhn/up2date_client/up2dateAuth.py", line 219, in getLoginInfo login() File "/usr/share/rhn/up2date_client/up2dateAuth.py", line 186, in login li = server.up2date.login(systemId) File "/usr/share/rhn/up2date_client/rhnserver.py", line 64, in __call__ raise up2dateErrors.SSLCertificateVerifyFailedError() SSLCertificateVerifyFailedError: The SSL certificate failed verification. diff --git a/client/rhel/rhn-client-tools/rhn-client-tools.spec b/client/rhel/rhn-client-tools/rhn-client-tools.spec index ba49218..1b92ecc 100644 --- a/client/rhel/rhn-client-tools/rhn-client-tools.spec +++ b/client/rhel/rhn-client-tools/rhn-client-tools.spec @@ -32,6 +32,7 @@ Requires: hal >= 0.5.8.1-52 Requires: newt Requires: python-dmidecode Requires: libxml2-python +Requires: yum Conflicts: up2date < 5.0.0 Conflicts: yum-rhn-plugin < 1.1.4-1 diff --git a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py index da0f529..0624d33 100644 --- a/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py +++ b/client/rhel/rhn-client-tools/src/up2date_client/up2dateErrors.py @@ -13,6 +13,7 @@ t = gettext.translation('rhn-client-tools', fallback=True) _ = t.ugettext import OpenSSL import config +from yum.Errors import RepoError class Error: """base class for errors""" @@ -188,9 +189,7 @@ class NoChannelsError(Error): def __repr__(self): return self.errmsg -class SSLCertificateVerifyFailedError(Error): - # TODO This should be a subclass of OpenSSL.Error or whatever and raised - # from rhnlib. +class SSLCertificateVerifyFailedError(RepoError): def __init__(self): # Need to override __init__ because the base class requires a message arg # and this exception shouldn't. @@ -201,10 +200,10 @@ class SSLCertificateVerifyFailedError(Error): f.close() tempCert = OpenSSL.crypto.load_certificate(OpenSSL.crypto.FILETYPE_PEM, buf) if tempCert.has_expired(): - Error.__init__(self ,"The certificate is expired. Please ensure you have the correct" - " certificate and your system time is correct.") + RepoError.__init__(self ,"The certificate %s is expired. Please ensure you have the correct" + " certificate and your system time is correct." % certFile) else: - Error.__init__(self, "The SSL certificate failed verification.") + RepoError.__init__(self, "The SSL certificate %s failed verification." % certFile) class SSLCertificateFileNotFound(Error): def __init__(self, errmsg):

1 0

satellite/install
by Miroslav Suchý 31 Mar '11

31 Mar '11

satellite/install/README | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) New commits: commit 6e35a3573d2f2b6e7acfd46921109346e32294dc Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Mar 31 10:56:56 2011 +0200 update link to documentation diff --git a/satellite/install/README b/satellite/install/README index 0386c82..b4609a4 100644 --- a/satellite/install/README +++ b/satellite/install/README @@ -1,4 +1,4 @@ -README - Red Hat Network Satellite v. 5.2 Installation +README - Red Hat Network Satellite v. 5.4 Installation ====================================================== INSTALLATION: PRE-REQUISITES @@ -8,8 +8,7 @@ Before beginning installation, make sure you have met the hardware, software, and database requirements necessary for Satellite installation as outlined in the RHN Satellite Installation Guide: -http://www.redhat.com/docs/manuals/satellite/Red_Hat_Network_Satellite-5.2.0/html/Installation_Guide/ch-requirements.html - +http://docs.redhat.com/docs/en-US/Red_Hat_Network_Satellite/5.4/html/Installation_Guide/ch-requirements.html INSTALLATION METHODS - BASIC USAGE ----------------------------------

1 0

Changes to 'refs/tags/spacewalk-setup-1.4.5-1'
by Miroslav Suchý 31 Mar '11

31 Mar '11

Tag 'spacewalk-setup-1.4.5-1' created by Miroslav Suchý <msuchy(a)redhat.com> at 2011-03-31 08:01 +0000 Tagging package [spacewalk-setup] version [1.4.5-1] in directory [spacewalk/setup/]. Changes since spacewalk-java-1.4.25-1: Miroslav Suchý (2): 683200 - fix syntax error Automatic commit of package [spacewalk-setup] release [1.4.5-1]. --- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +- spacewalk/setup/spacewalk-setup.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

2 commits - rel-eng/packages spacewalk/setup
by Miroslav Suchý 31 Mar '11

31 Mar '11

rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/lib/Spacewalk/Setup.pm | 2 +- spacewalk/setup/spacewalk-setup.spec | 5 ++++- 3 files changed, 6 insertions(+), 3 deletions(-) New commits: commit e0b6c536a946ef2a141aa44e1dccd0ec5be3f663 Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Mar 31 10:01:56 2011 +0200 Automatic commit of package [spacewalk-setup] release [1.4.5-1]. diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup index 429bf55..da75f40 100644 --- a/rel-eng/packages/spacewalk-setup +++ b/rel-eng/packages/spacewalk-setup @@ -1 +1 @@ -1.4.4-1 spacewalk/setup/ +1.4.5-1 spacewalk/setup/ diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec index a325c03..3da39f6 100644 --- a/spacewalk/setup/spacewalk-setup.spec +++ b/spacewalk/setup/spacewalk-setup.spec @@ -1,5 +1,5 @@ Name: spacewalk-setup -Version: 1.4.4 +Version: 1.4.5 Release: 1%{?dist} Summary: Initial setup tools for Red Hat Spacewalk @@ -101,6 +101,9 @@ rm -rf %{buildroot} %attr(755, apache, root) %{_var}/spacewalk %changelog +* Thu Mar 31 2011 Miroslav Suchý 1.4.5-1 +- 683200 - fix syntax error + * Wed Mar 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.4-1 - fixed missing output redirection - oracle_sqlplus_t is not able to write to logs commit b1591bf2bdd66ff685a3cb55e9c58686b0eeaddb Author: Miroslav Suchý <msuchy(a)redhat.com> Date: Thu Mar 31 10:01:04 2011 +0200 683200 - fix syntax error diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm index 01326a1..58c449f 100644 --- a/spacewalk/setup/lib/Spacewalk/Setup.pm +++ b/spacewalk/setup/lib/Spacewalk/Setup.pm @@ -753,7 +753,7 @@ REDO_CONNECT: -default => 'localhost', -answer => \$answers->{'db-host'}); - $answers->{'db-host'} = Net::LibIDN::idn_to_ascii($answers->{'db-host'}) + $answers->{'db-host'} = Net::LibIDN::idn_to_ascii($answers->{'db-host'}); $data{'db-name'} = _oracle_make_dsn_string($answers); if (defined $data{'db-name'}) { # Try db-name as SID for host (//host:port/name).

1 0

Changes to 'refs/tags/spacewalk-java-1.4.25-1'
by Michael Mraka 31 Mar '11

31 Mar '11

Tag 'spacewalk-java-1.4.25-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-03-31 06:43 +0000 Tagging package [spacewalk-java] version [1.4.25-1] in directory [java/]. Changes since spacewalk-setup-1.4.4-1: Michael Mraka (2): replaced check_probe synonym with original table Automatic commit of package [spacewalk-java] release [1.4.25-1]. --- java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml | 2 +- java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 3 files changed, 6 insertions(+), 3 deletions(-) ---

1 0

java/spacewalk-java.spec rel-eng/packages
by Michael Mraka 31 Mar '11

31 Mar '11

java/spacewalk-java.spec | 5 ++++- rel-eng/packages/spacewalk-java | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) New commits: commit 34e990b59a23ba7d13fdfbb0ada41778934ada7a Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Mar 31 08:43:03 2011 +0200 Automatic commit of package [spacewalk-java] release [1.4.25-1]. diff --git a/java/spacewalk-java.spec b/java/spacewalk-java.spec index fd32ba5..a4e2480 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.24 +Version: 1.4.25 Release: 1%{?dist} URL: https://fedorahosted.org/spacewalk Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz @@ -532,6 +532,9 @@ fi %{jardir}/postgresql-jdbc.jar %changelog +* Thu Mar 31 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.25-1 +- replaced check_probe synonym with original table + * Wed Mar 30 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.4.24-1 - jakarta-commons-io is unused once jakarta-commons-fileupload is gone diff --git a/rel-eng/packages/spacewalk-java b/rel-eng/packages/spacewalk-java index 262ede1..7eaf86c 100644 --- a/rel-eng/packages/spacewalk-java +++ b/rel-eng/packages/spacewalk-java @@ -1 +1 @@ -1.4.24-1 java/ +1.4.25-1 java/

1 0

java/code
by Michael Mraka 31 Mar '11

31 Mar '11

java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) New commits: commit e9cb8e1b3e6bd19992d3921dbf9588cd91a18acd Author: Michael Mraka <michael.mraka(a)redhat.com> Date: Thu Mar 31 08:36:44 2011 +0200 replaced check_probe synonym with original table fixing com.redhat.rhn.common.db.datasource.CachedStatement - Error while processing cached statement sql: SELECT C.description, count(p.recid) probe_count, count(S.id) server_count FROM rhn_probe P, rhn_command C, rhn_command_groups CG, rhnServer S, rhn_probe_state PS, rhnUserServerPerms USP where P.command_id = C.recid AND C.group_name = CG.group_name AND P.recid = PS.probe_id AND PS.state = ? AND P.customer_id = ? AND S.id = (SELECT host_id from check_probe where probe_id = P.recid) AND USP.user_id = ? AND USP.server_id = S.id GROUP BY CG.description, C.description ORDER BY CG.description com.redhat.rhn.common.db.WrappedSQLException: ERROR: relation "check_probe" does not exist diff --git a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml index dc906ea..8ccae6a 100644 --- a/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml +++ b/java/code/src/com/redhat/rhn/common/db/datasource/xml/Monitoring_queries.xml @@ -239,7 +239,7 @@ SELECT C.description, AND P.recid = PS.probe_id AND PS.state = :state AND P.customer_id = :org_id - AND S.id = (SELECT host_id from check_probe where probe_id = P.recid) + AND S.id = (SELECT host_id from rhn_check_probe where probe_id = P.recid) AND USP.user_id = :user_id AND USP.server_id = S.id GROUP BY CG.description, C.description

1 0

Changes to 'refs/tags/spacewalk-setup-1.4.4-1'
by Michael Mraka 30 Mar '11

30 Mar '11

Tag 'spacewalk-setup-1.4.4-1' created by Michael Mraka <michael.mraka(a)redhat.com> at 2011-03-30 19:32 +0000 Tagging package [spacewalk-setup] version [1.4.4-1] in directory [spacewalk/setup/]. Changes since spacewalk-schema-1.4.13-1: Michael Mraka (2): fixed missing output redirection Automatic commit of package [spacewalk-setup] release [1.4.4-1]. --- rel-eng/packages/spacewalk-setup | 2 +- spacewalk/setup/share/oracle/upgrade-db.sh | 2 +- spacewalk/setup/spacewalk-setup.spec | 6 +++++- 3 files changed, 7 insertions(+), 3 deletions(-) ---

1 0

Jump to page:

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

spacewalk-commits March 2011