Changes to 'refs/tags/spacewalk-admin-1.3.8-1'
by Jan Pazdziora
Tag 'spacewalk-admin-1.3.8-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-18 15:38 +0000
Tagging package [spacewalk-admin] version [1.3.8-1] in directory [spacewalk/admin/].
Changes since spacewalk-backend-1.3.43-1:
Jan Pazdziora (2):
The rhn-config-tnsnames.pl is no longer used, removing.
Automatic commit of package [spacewalk-admin] release [1.3.8-1].
---
rel-eng/packages/spacewalk-admin | 2
spacewalk/admin/Makefile.admin | 1
spacewalk/admin/rhn-config-tnsnames.pl | 106 ---------------------------------
spacewalk/admin/spacewalk-admin.spec | 7 +-
4 files changed, 6 insertions(+), 110 deletions(-)
---
13 years, 5 months
rel-eng/packages spacewalk/admin
by Jan Pazdziora
rel-eng/packages/spacewalk-admin | 2 +-
spacewalk/admin/spacewalk-admin.spec | 6 +++++-
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 599e4dacb7e09d7a81f3a74107ced7005441c8c2
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 18 16:37:59 2011 +0100
Automatic commit of package [spacewalk-admin] release [1.3.8-1].
diff --git a/rel-eng/packages/spacewalk-admin b/rel-eng/packages/spacewalk-admin
index 16b520b..2cf4dca 100644
--- a/rel-eng/packages/spacewalk-admin
+++ b/rel-eng/packages/spacewalk-admin
@@ -1 +1 @@
-1.3.7-1 spacewalk/admin/
+1.3.8-1 spacewalk/admin/
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index 8ffdd06..7f99c07 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -2,7 +2,7 @@
Summary: Various utility scripts and data files for RHN Satellite installations
Name: spacewalk-admin
URL: https://fedorahosted.org/spacewalk
-Version: 1.3.7
+Version: 1.3.8
Release: 1%{?dist}
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
License: GPLv2
@@ -71,6 +71,10 @@ rm -rf $RPM_BUILD_ROOT
%{_mandir}/man8/spacewalk-service.8*
%changelog
+* Tue Jan 18 2011 Jan Pazdziora 1.3.8-1
+- The rhn-config-tnsnames.pl is no longer used, removing.
+- Do not call external /bin/touch to create a lockfile.
+
* Tue Jan 11 2011 Miroslav Suchý <msuchy(a)redhat.com> 1.3.7-1
- more update of spacewalk-service man page (msuchy(a)redhat.com)
- Change to root directory for PostgreSQL, just like we do for sqlplus.
13 years, 5 months
spacewalk/admin
by Jan Pazdziora
spacewalk/admin/Makefile.admin | 1
spacewalk/admin/rhn-config-tnsnames.pl | 106 ---------------------------------
spacewalk/admin/spacewalk-admin.spec | 1
3 files changed, 108 deletions(-)
New commits:
commit a1c217b1521cc5cb43c21929d9c80446c29e9f20
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 18 16:37:30 2011 +0100
The rhn-config-tnsnames.pl is no longer used, removing.
diff --git a/spacewalk/admin/Makefile.admin b/spacewalk/admin/Makefile.admin
index 876c6e7..dc55696 100644
--- a/spacewalk/admin/Makefile.admin
+++ b/spacewalk/admin/Makefile.admin
@@ -31,7 +31,6 @@ GPGKEY_DEST = $(PREFIX)/$(GPGKEYDIR)
PERL_SCRIPTS = rhn-config-satellite.pl \
rhn-config-schema.pl \
- rhn-config-tnsnames.pl \
rhn-deploy-ca-cert.pl \
rhn-install-ssl-cert.pl \
rhn-populate-database.pl \
diff --git a/spacewalk/admin/rhn-config-tnsnames.pl b/spacewalk/admin/rhn-config-tnsnames.pl
deleted file mode 100755
index 2b2871f..0000000
--- a/spacewalk/admin/rhn-config-tnsnames.pl
+++ /dev/null
@@ -1,106 +0,0 @@
-#!/usr/bin/perl
-#
-# 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.
-#
-#
-# $Id$
-
-use strict;
-use warnings;
-
-use Getopt::Long;
-use English;
-
-$ENV{PATH} = '/bin:/usr/bin';
-
-my $usage = "usage: $0 --target=<target_file> --sid=<sid> --address=<proto,host,port> "
- . "[ --address=<proto,host,port> ] [ --help ]\n";
-
-my $target = '';
-my $sid = '';
-my @options = ();
-my $help = '';
-
-GetOptions("target=s" => \$target, "sid=s" => \$sid, "address=s" => \@options, "help" => \$help) or die $usage;
-
-if ($help) {
- die $usage;
-}
-
-unless ($target and $sid and (@options)) {
- die $usage;
-}
-
-my @addresses = parse_addresses(@options);
-my $tnsdata = generate_tnsnames($sid, \@addresses);
-
-if (-e $target) {
- rename($target, $target . ".orig") or die "Could not rename $target to ${target}.orig: $OS_ERROR";
-}
-
-open(TARGET, "> $target") or die "Could not open $target: $OS_ERROR";
-select(TARGET);
-
-print $tnsdata;
-
-close(TARGET);
-
-exit 0;
-
-sub parse_addresses {
- my @options = @_;
- my @addresses;
-
- foreach my $opt (@options) {
- my @line = split(/,/, $opt);
- push @addresses, { protocol => $line[0],
- host => $line[1],
- port => $line[2],
- };
- }
-
- return @addresses;
-}
-
-sub generate_tnsnames {
- my $sid = shift;
- my $addresses = shift;
-
- my $tnsnames_template =<<EOQ;
-%s =
- (DESCRIPTION =
- (ADDRESS_LIST =
-%s
- )
- (CONNECT_DATA =
- (SID = %s)
- )
- )
-EOQ
-
- my $address_template = (' ' x 6) . '(ADDRESS = (PROTOCOL = %s)(HOST = %s)(PORT = %s))';
-
- my @address_lines;
-
- foreach my $address (@{$addresses}) {
- push @address_lines,
- sprintf($address_template, $address->{protocol}, $address->{host}, $address->{port});
- }
-
- my $tnsnames = sprintf($tnsnames_template, $sid, join("\n", @address_lines), $sid);
-
- return $tnsnames;
-}
-
-
diff --git a/spacewalk/admin/spacewalk-admin.spec b/spacewalk/admin/spacewalk-admin.spec
index b90c5e4..8ffdd06 100644
--- a/spacewalk/admin/spacewalk-admin.spec
+++ b/spacewalk/admin/spacewalk-admin.spec
@@ -55,7 +55,6 @@ rm -rf $RPM_BUILD_ROOT
%{_bindir}/validate-sat-cert
%{_bindir}/rhn-config-satellite.pl
%{_bindir}/rhn-config-schema.pl
-%{_bindir}/rhn-config-tnsnames.pl
%{_bindir}/rhn-populate-database.pl
%{_bindir}/rhn-generate-pem.pl
%{_bindir}/rhn-sudo-load-ssl-cert
13 years, 5 months
Changes to 'refs/tags/spacewalk-setup-1.3.7-1'
by Jan Pazdziora
Tag 'spacewalk-setup-1.3.7-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-18 15:34 +0000
Tagging package [spacewalk-setup] version [1.3.7-1] in directory [spacewalk/setup/].
Changes since spacewalk-backend-1.3.42-1:
Jan Pazdziora (5):
Refactored oracle_get_database_answers.
As db-protocol is no longer processed (supported), removing.
The db-sid is long gone, using db-name now.
Split to just two parts.
Automatic commit of package [spacewalk-setup] release [1.3.7-1].
Milan Zazrivec (2):
fix expression semantics
666545 - don't report empty transactions as a successful action
Miroslav Suchý (5):
649233 - reset busy mouse cursor back to arrow after unexpected error
670458 - check password policy only if we are really going to reserve user
dead code: removal of function foobar()
628920 - rhel4 does not support selinux
651403 - reference to RHEL6 as actuall system
---
backend/server/handlers/xmlrpc/registration.py | 8
backend/server/rhnSQL/__init__.py | 2
backend/server/rhnUser.py | 1
client/rhel/rhn-client-tools/data/rh_register.glade | 2
client/rhel/rhn-client-tools/po/ar.po | 4
client/rhel/rhn-client-tools/po/as.po | 4
client/rhel/rhn-client-tools/po/bg.po | 4
client/rhel/rhn-client-tools/po/bn.po | 4
client/rhel/rhn-client-tools/po/bn_IN.po | 4
client/rhel/rhn-client-tools/po/ca.po | 4
client/rhel/rhn-client-tools/po/cs.po | 4
client/rhel/rhn-client-tools/po/cy.po | 4
client/rhel/rhn-client-tools/po/da.po | 4
client/rhel/rhn-client-tools/po/de.po | 8
client/rhel/rhn-client-tools/po/el.po | 4
client/rhel/rhn-client-tools/po/en_GB.po | 4
client/rhel/rhn-client-tools/po/es.po | 8
client/rhel/rhn-client-tools/po/et.po | 4
client/rhel/rhn-client-tools/po/fa.po | 4
client/rhel/rhn-client-tools/po/fi.po | 4
client/rhel/rhn-client-tools/po/fr.po | 4
client/rhel/rhn-client-tools/po/gu.po | 4
client/rhel/rhn-client-tools/po/he.po | 4
client/rhel/rhn-client-tools/po/hi.po | 4
client/rhel/rhn-client-tools/po/hr.po | 4
client/rhel/rhn-client-tools/po/hu.po | 4
client/rhel/rhn-client-tools/po/hy.po | 4
client/rhel/rhn-client-tools/po/id.po | 4
client/rhel/rhn-client-tools/po/is.po | 4
client/rhel/rhn-client-tools/po/it.po | 8
client/rhel/rhn-client-tools/po/ja.po | 4
client/rhel/rhn-client-tools/po/ka.po | 4
client/rhel/rhn-client-tools/po/kn.po | 4
client/rhel/rhn-client-tools/po/ko.po | 4
client/rhel/rhn-client-tools/po/ku.po | 4
client/rhel/rhn-client-tools/po/lo.po | 4
client/rhel/rhn-client-tools/po/lv.po | 4
client/rhel/rhn-client-tools/po/mk.po | 4
client/rhel/rhn-client-tools/po/ml.po | 8
client/rhel/rhn-client-tools/po/mr.po | 4
client/rhel/rhn-client-tools/po/ms.po | 4
client/rhel/rhn-client-tools/po/my.po | 4
client/rhel/rhn-client-tools/po/nb.po | 4
client/rhel/rhn-client-tools/po/nl.po | 4
client/rhel/rhn-client-tools/po/no.po | 4
client/rhel/rhn-client-tools/po/or.po | 4
client/rhel/rhn-client-tools/po/pa.po | 4
client/rhel/rhn-client-tools/po/pl.po | 4
client/rhel/rhn-client-tools/po/pt.po | 4
client/rhel/rhn-client-tools/po/pt_BR.po | 4
client/rhel/rhn-client-tools/po/rhn-client-tools.pot | 4
client/rhel/rhn-client-tools/po/ro.po | 4
client/rhel/rhn-client-tools/po/ru.po | 8
client/rhel/rhn-client-tools/po/si.po | 4
client/rhel/rhn-client-tools/po/sk.po | 4
client/rhel/rhn-client-tools/po/sl.po | 4
client/rhel/rhn-client-tools/po/sq.po | 4
client/rhel/rhn-client-tools/po/sr.po | 4
client/rhel/rhn-client-tools/po/sr(a)Latn.po | 4
client/rhel/rhn-client-tools/po/sv.po | 8
client/rhel/rhn-client-tools/po/ta.po | 4
client/rhel/rhn-client-tools/po/te.po | 8
client/rhel/rhn-client-tools/po/tr.po | 4
client/rhel/rhn-client-tools/po/uk.po | 4
client/rhel/rhn-client-tools/po/ur.po | 4
client/rhel/rhn-client-tools/po/vi.po | 4
client/rhel/rhn-client-tools/po/zh_CN.GB2312.po | 4
client/rhel/rhn-client-tools/po/zh_CN.po | 6
client/rhel/rhn-client-tools/po/zh_TW.Big5.po | 4
client/rhel/rhn-client-tools/po/zh_TW.po | 4
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 1
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 3
client/rhel/yum-rhn-plugin/actions/packages.py | 5
client/tools/rhncfg/config_management/rhncfg_diff.py | 3
rel-eng/packages/spacewalk-setup | 2
satellite/install/answers.txt | 3
spacewalk/setup/answers.txt | 3
spacewalk/setup/lib/Spacewalk/Setup.pm | 226 ++++++++---
spacewalk/setup/share/defaults.d/defaults.conf | 3
spacewalk/setup/spacewalk-setup.spec | 8
80 files changed, 351 insertions(+), 213 deletions(-)
---
13 years, 5 months
Changes to 'refs/tags/spacewalk-backend-1.3.43-1'
by Jan Pazdziora
Tag 'spacewalk-backend-1.3.43-1' created by Jan Pazdziora <jpazdziora(a)redhat.com> at 2011-01-18 15:35 +0000
Tagging package [spacewalk-backend] version [1.3.43-1] in directory [backend/].
Changes since spacewalk-backend-1.3.42-1:
Jan Pazdziora (6):
Refactored oracle_get_database_answers.
As db-protocol is no longer processed (supported), removing.
The db-sid is long gone, using db-name now.
Split to just two parts.
Automatic commit of package [spacewalk-setup] release [1.3.7-1].
Automatic commit of package [spacewalk-backend] release [1.3.43-1].
Milan Zazrivec (2):
fix expression semantics
666545 - don't report empty transactions as a successful action
Miroslav Suchý (5):
649233 - reset busy mouse cursor back to arrow after unexpected error
670458 - check password policy only if we are really going to reserve user
dead code: removal of function foobar()
628920 - rhel4 does not support selinux
651403 - reference to RHEL6 as actuall system
---
backend/server/handlers/xmlrpc/registration.py | 8
backend/server/rhnSQL/__init__.py | 2
backend/server/rhnUser.py | 1
backend/spacewalk-backend.spec | 7
client/rhel/rhn-client-tools/data/rh_register.glade | 2
client/rhel/rhn-client-tools/po/ar.po | 4
client/rhel/rhn-client-tools/po/as.po | 4
client/rhel/rhn-client-tools/po/bg.po | 4
client/rhel/rhn-client-tools/po/bn.po | 4
client/rhel/rhn-client-tools/po/bn_IN.po | 4
client/rhel/rhn-client-tools/po/ca.po | 4
client/rhel/rhn-client-tools/po/cs.po | 4
client/rhel/rhn-client-tools/po/cy.po | 4
client/rhel/rhn-client-tools/po/da.po | 4
client/rhel/rhn-client-tools/po/de.po | 8
client/rhel/rhn-client-tools/po/el.po | 4
client/rhel/rhn-client-tools/po/en_GB.po | 4
client/rhel/rhn-client-tools/po/es.po | 8
client/rhel/rhn-client-tools/po/et.po | 4
client/rhel/rhn-client-tools/po/fa.po | 4
client/rhel/rhn-client-tools/po/fi.po | 4
client/rhel/rhn-client-tools/po/fr.po | 4
client/rhel/rhn-client-tools/po/gu.po | 4
client/rhel/rhn-client-tools/po/he.po | 4
client/rhel/rhn-client-tools/po/hi.po | 4
client/rhel/rhn-client-tools/po/hr.po | 4
client/rhel/rhn-client-tools/po/hu.po | 4
client/rhel/rhn-client-tools/po/hy.po | 4
client/rhel/rhn-client-tools/po/id.po | 4
client/rhel/rhn-client-tools/po/is.po | 4
client/rhel/rhn-client-tools/po/it.po | 8
client/rhel/rhn-client-tools/po/ja.po | 4
client/rhel/rhn-client-tools/po/ka.po | 4
client/rhel/rhn-client-tools/po/kn.po | 4
client/rhel/rhn-client-tools/po/ko.po | 4
client/rhel/rhn-client-tools/po/ku.po | 4
client/rhel/rhn-client-tools/po/lo.po | 4
client/rhel/rhn-client-tools/po/lv.po | 4
client/rhel/rhn-client-tools/po/mk.po | 4
client/rhel/rhn-client-tools/po/ml.po | 8
client/rhel/rhn-client-tools/po/mr.po | 4
client/rhel/rhn-client-tools/po/ms.po | 4
client/rhel/rhn-client-tools/po/my.po | 4
client/rhel/rhn-client-tools/po/nb.po | 4
client/rhel/rhn-client-tools/po/nl.po | 4
client/rhel/rhn-client-tools/po/no.po | 4
client/rhel/rhn-client-tools/po/or.po | 4
client/rhel/rhn-client-tools/po/pa.po | 4
client/rhel/rhn-client-tools/po/pl.po | 4
client/rhel/rhn-client-tools/po/pt.po | 4
client/rhel/rhn-client-tools/po/pt_BR.po | 4
client/rhel/rhn-client-tools/po/rhn-client-tools.pot | 4
client/rhel/rhn-client-tools/po/ro.po | 4
client/rhel/rhn-client-tools/po/ru.po | 8
client/rhel/rhn-client-tools/po/si.po | 4
client/rhel/rhn-client-tools/po/sk.po | 4
client/rhel/rhn-client-tools/po/sl.po | 4
client/rhel/rhn-client-tools/po/sq.po | 4
client/rhel/rhn-client-tools/po/sr.po | 4
client/rhel/rhn-client-tools/po/sr(a)Latn.po | 4
client/rhel/rhn-client-tools/po/sv.po | 8
client/rhel/rhn-client-tools/po/ta.po | 4
client/rhel/rhn-client-tools/po/te.po | 8
client/rhel/rhn-client-tools/po/tr.po | 4
client/rhel/rhn-client-tools/po/uk.po | 4
client/rhel/rhn-client-tools/po/ur.po | 4
client/rhel/rhn-client-tools/po/vi.po | 4
client/rhel/rhn-client-tools/po/zh_CN.GB2312.po | 4
client/rhel/rhn-client-tools/po/zh_CN.po | 6
client/rhel/rhn-client-tools/po/zh_TW.Big5.po | 4
client/rhel/rhn-client-tools/po/zh_TW.po | 4
client/rhel/rhn-client-tools/src/up2date_client/rhnregGui.py | 1
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 3
client/rhel/yum-rhn-plugin/actions/packages.py | 5
client/tools/rhncfg/config_management/rhncfg_diff.py | 3
rel-eng/packages/spacewalk-backend | 2
rel-eng/packages/spacewalk-setup | 2
satellite/install/answers.txt | 3
spacewalk/setup/answers.txt | 3
spacewalk/setup/lib/Spacewalk/Setup.pm | 226 ++++++++---
spacewalk/setup/share/defaults.d/defaults.conf | 3
spacewalk/setup/spacewalk-setup.spec | 8
82 files changed, 358 insertions(+), 215 deletions(-)
---
13 years, 5 months
2 commits - backend/spacewalk-backend.spec rel-eng/packages spacewalk/setup
by Jan Pazdziora
backend/spacewalk-backend.spec | 7 ++++++-
rel-eng/packages/spacewalk-backend | 2 +-
rel-eng/packages/spacewalk-setup | 2 +-
spacewalk/setup/spacewalk-setup.spec | 8 +++++++-
4 files changed, 15 insertions(+), 4 deletions(-)
New commits:
commit 49a614cd227461ffa835ad9144af71bb1849a076
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 18 16:35:46 2011 +0100
Automatic commit of package [spacewalk-backend] release [1.3.43-1].
diff --git a/backend/spacewalk-backend.spec b/backend/spacewalk-backend.spec
index 66ff436..b3eb1f6 100644
--- a/backend/spacewalk-backend.spec
+++ b/backend/spacewalk-backend.spec
@@ -11,7 +11,7 @@ Name: spacewalk-backend
Summary: Common programs needed to be installed on the Spacewalk servers/proxies
Group: Applications/Internet
License: GPLv2 and Python
-Version: 1.3.42
+Version: 1.3.43
Release: 1%{?dist}
URL: https://fedorahosted.org/spacewalk
Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz
@@ -683,6 +683,11 @@ rm -f %{rhnconf}/rhnSecret.py*
# $Id$
%changelog
+* Tue Jan 18 2011 Jan Pazdziora 1.3.43-1
+- Split to just two parts.
+- 670458 - check password policy only if we are really going to reserve user
+ (msuchy(a)redhat.com)
+
* Tue Jan 18 2011 Michael Mraka <michael.mraka(a)redhat.com> 1.3.42-1
- 650165 - fixed kickstart incremental export
diff --git a/rel-eng/packages/spacewalk-backend b/rel-eng/packages/spacewalk-backend
index 4ab5e31..bb36e06 100644
--- a/rel-eng/packages/spacewalk-backend
+++ b/rel-eng/packages/spacewalk-backend
@@ -1 +1 @@
-1.3.42-1 backend/
+1.3.43-1 backend/
commit 1787c708ebac07b56dd56b309e7ef35274d6071f
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 18 16:34:27 2011 +0100
Automatic commit of package [spacewalk-setup] release [1.3.7-1].
diff --git a/rel-eng/packages/spacewalk-setup b/rel-eng/packages/spacewalk-setup
index 72a45bd..9aa289b 100644
--- a/rel-eng/packages/spacewalk-setup
+++ b/rel-eng/packages/spacewalk-setup
@@ -1 +1 @@
-1.3.6-1 spacewalk/setup/
+1.3.7-1 spacewalk/setup/
diff --git a/spacewalk/setup/spacewalk-setup.spec b/spacewalk/setup/spacewalk-setup.spec
index 7279c1d..ce6b095 100644
--- a/spacewalk/setup/spacewalk-setup.spec
+++ b/spacewalk/setup/spacewalk-setup.spec
@@ -1,5 +1,5 @@
Name: spacewalk-setup
-Version: 1.3.6
+Version: 1.3.7
Release: 1%{?dist}
Summary: Initial setup tools for Red Hat Spacewalk
@@ -101,6 +101,12 @@ rm -rf %{buildroot}
%attr(755, apache, root) %{_var}/spacewalk
%changelog
+* Tue Jan 18 2011 Jan Pazdziora 1.3.7-1
+- The db-sid is long gone, using db-name now.
+- As db-protocol is no longer processed (supported), removing.
+- Refactored oracle_get_database_answers.
+- Creating empty file is not that useful, dropping.
+
* Tue Jan 11 2011 Tomas Lestach <tlestach(a)redhat.com> 1.3.6-1
- replace any LD_LIBRARY_PATH by given content (tlestach(a)redhat.com)
- Removing Oracle-ism from postgresql_populate_db. (jpazdziora(a)redhat.com)
13 years, 5 months
4 commits - backend/server satellite/install spacewalk/setup
by Jan Pazdziora
backend/server/rhnSQL/__init__.py | 2
satellite/install/answers.txt | 3
spacewalk/setup/answers.txt | 3
spacewalk/setup/lib/Spacewalk/Setup.pm | 226 +++++++++++++++++++------
spacewalk/setup/share/defaults.d/defaults.conf | 3
5 files changed, 182 insertions(+), 55 deletions(-)
New commits:
commit 78ff53ded6153b365776007c3b3c2e3e20487bdc
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 18 16:31:54 2011 +0100
Split to just two parts.
There can be slashes (and doubleslashes) in DSN now.
Addressing
[Tue Jan 18 09:55:33 2011] [error] [client 127.0.0.1] Traceback (most recent call last):
[Tue Jan 18 09:55:33 2011] [error] [client 127.0.0.1] File "/usr/share/rhn/wsgi/xmlrpc.py", line 22, in application
[Tue Jan 18 09:55:33 2011] [error] [client 127.0.0.1] return wsgiHandler.handle(environ, start_response, "xmlrpc", "server.xmlrpc")
[Tue Jan 18 09:55:33 2011] [error] [client 127.0.0.1] File "/usr/share/rhn/wsgi/wsgiHandler.py", line 37, in handle
[Tue Jan 18 09:55:33 2011] [error] [client 127.0.0.1] ret = parseServ(req)
[Tue Jan 18 09:55:33 2011] [error] [client 127.0.0.1] File "/usr/lib/python2.6/site-packages/spacewalk/server/apacheHandler.py", line 77, in headerParserHandler
[Tue Jan 18 09:55:33 2011] [error] [client 127.0.0.1] rhnSQL.initDB()
[Tue Jan 18 09:55:33 2011] [error] [client 127.0.0.1] File "/usr/lib/python2.6/site-packages/spacewalk/server/rhnSQL/__init__.py", line 95, in initDB
[Tue Jan 18 09:55:33 2011] [error] [client 127.0.0.1] (username, temp) = dsn.split("/")
[Tue Jan 18 09:55:33 2011] [error] [client 127.0.0.1] ValueError: too many values to unpack
diff --git a/backend/server/rhnSQL/__init__.py b/backend/server/rhnSQL/__init__.py
index 29fd23f..cab6ec6 100644
--- a/backend/server/rhnSQL/__init__.py
+++ b/backend/server/rhnSQL/__init__.py
@@ -92,7 +92,7 @@ def initDB(dsn=None, backend=None, host="localhost", port=None, username=None,
if dsn:
# split the dsn up into username/pass/sid so we can call the rest of
# the code in a uniform fashion for all database backends:
- (username, temp) = dsn.split("/")
+ (username, temp) = dsn.split("/", 1)
(password, database) = temp.split("@")
del temp
commit 468139caf256e877920e02a0cc075e673d38cb24
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 18 16:30:25 2011 +0100
The db-sid is long gone, using db-name now.
diff --git a/satellite/install/answers.txt b/satellite/install/answers.txt
index a51464f..681c072 100644
--- a/satellite/install/answers.txt
+++ b/satellite/install/answers.txt
@@ -78,7 +78,7 @@ ssl-password =
# db-user =
# db-password =
# db-host =
-# db-sid =
+# db-name =
# db-port = 1521
diff --git a/spacewalk/setup/answers.txt b/spacewalk/setup/answers.txt
index 6fdd364..c4677f6 100644
--- a/spacewalk/setup/answers.txt
+++ b/spacewalk/setup/answers.txt
@@ -11,7 +11,7 @@ satellite-cert-file = /usr/share/spacewalk/setup/spacewalk-public.cert
db-backend=oracle
db-user=foo
db-password=bar
-db-sid=oracle_sid
+db-name=service_name.world
db-host=hostname.of.your.db
db-port=1521
enable-tftp=N
diff --git a/spacewalk/setup/share/defaults.d/defaults.conf b/spacewalk/setup/share/defaults.d/defaults.conf
index 39345ff..c568f6d 100644
--- a/spacewalk/setup/share/defaults.d/defaults.conf
+++ b/spacewalk/setup/share/defaults.d/defaults.conf
@@ -78,7 +78,7 @@ ssl-password =
# db-user =
# db-password =
# db-host =
-# db-sid =
+# db-name =
# db-port = 1521
## Apache conf.d/ssl.conf virtual host definition reconfiguration
commit b5d64f11b0a95836e7342394db916692948d23aa
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 18 16:29:26 2011 +0100
As db-protocol is no longer processed (supported), removing.
diff --git a/satellite/install/answers.txt b/satellite/install/answers.txt
index 9810902..a51464f 100644
--- a/satellite/install/answers.txt
+++ b/satellite/install/answers.txt
@@ -80,7 +80,6 @@ ssl-password =
# db-host =
# db-sid =
# db-port = 1521
-# db-protocol = TCP
## The location (absolute path) of the satellite certificate file.
diff --git a/spacewalk/setup/answers.txt b/spacewalk/setup/answers.txt
index 3286958..6fdd364 100644
--- a/spacewalk/setup/answers.txt
+++ b/spacewalk/setup/answers.txt
@@ -14,5 +14,4 @@ db-password=bar
db-sid=oracle_sid
db-host=hostname.of.your.db
db-port=1521
-db-protocol=TCP
enable-tftp=N
diff --git a/spacewalk/setup/share/defaults.d/defaults.conf b/spacewalk/setup/share/defaults.d/defaults.conf
index 16f5467..39345ff 100644
--- a/spacewalk/setup/share/defaults.d/defaults.conf
+++ b/spacewalk/setup/share/defaults.d/defaults.conf
@@ -80,7 +80,6 @@ ssl-password =
# db-host =
# db-sid =
# db-port = 1521
-# db-protocol = TCP
## Apache conf.d/ssl.conf virtual host definition reconfiguration
#
commit 11df63a4baf949231d1fb52fabf41c64b0753c77
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Tue Jan 18 16:25:24 2011 +0100
Refactored oracle_get_database_answers.
We do not want to ask for username and password before we know
what database we talk to.
Also, we no longer create/change /etc/tnsnames.ora.
The db-name in answer file can either refer to service name
at db-host (//db-host(:db-port)/db-name) or to a service name
specified in tnsnames.ora. This allows the user to set anything
in their tnsnames.ora before running spacewalk-setup (think RAC
and any advanced options) and just use it.
For similar reason, db-protocol is no longer supported.
diff --git a/spacewalk/setup/lib/Spacewalk/Setup.pm b/spacewalk/setup/lib/Spacewalk/Setup.pm
index cff1bcf..98a2e35 100644
--- a/spacewalk/setup/lib/Spacewalk/Setup.pm
+++ b/spacewalk/setup/lib/Spacewalk/Setup.pm
@@ -646,52 +646,192 @@ sub set_progress_callback {
alarm 1;
}
-sub oracle_get_database_answers {
- my $opts = shift;
- my $answers = shift;
+# Format connect data to connect string.
+sub _oracle_make_dsn_string {
+ my $data = shift;
+ if (not (defined $data->{'db-host'} and defined $data->{'db-name'})) {
+ return;
+ }
+ my $dsn = "//$data->{'db-host'}";
+ if (defined $data->{'db-port'}) {
+ $dsn .= ':' . $data->{'db-port'};
+ }
+ $dsn .= "/$data->{'db-name'}";
+ return $dsn;
+}
- ask(
- -noninteractive => $opts->{"non-interactive"},
- -question => "DB User",
- -test => qr/\S+/,
- -answer => \$answers->{'db-user'});
+# We attempt to connect to the database using the current db-* values.
+# Returns 0 if could not even connect, 1 if could connect but
+# login/password was wrong, and 2 if the connect was fully successful.
+sub _oracle_check_connect_info {
+ my $data = shift;
+ eval {
+ my $dbh = get_dbh($data);
+ $dbh->disconnect();
+ };
+ if (not $@) {
+ # We were able to connect to the database. Good.
+ return 2;
+ }
+ if (DBI->err() == 1017 or DBI->err() == 1005) {
+ # We at least knew the connect string, so we
+ # were able to communicate with the database.
+ return 1;
+ }
+ return 0;
+}
- ask(
- -noninteractive => $opts->{"non-interactive"},
- -question => "DB Password",
- -test => qr/\S+/,
- -answer => \$answers->{'db-password'},
- -password => 1);
+# Called from oracle_get_database_answers, here we focus on
+# at least reaching some instance, not worrying about username
+# and password for now.
+sub oracle_get_connect_answers {
+ my $opts = shift;
+ my $answers = shift;
- ask(
- -noninteractive => $opts->{"non-interactive"},
- -question => "DB SID",
- -test => qr/\S+/,
- -answer => \$answers->{'db-name'});
+ my $ret;
+
+ my %data;
+ $data{'db-backend'} = 'oracle';
+ $data{'db-user'} = $answers->{'db-user'};
+ $data{'db-password'} = $answers->{'db-password'};
+
+REDO_CONNECT:
+ # If the answers hold data that make it possible
+ # to create DSN, try it without asking first.
+ $data{'db-name'} = _oracle_make_dsn_string($answers);
+ if (defined $data{'db-name'}) {
+ # Try the direct //host:port/name format.
+ if ($ret = _oracle_check_connect_info(\%data)) {
+ # It worked, we shall set it in place of name.
+ $answers->{'db-name'} = $data{'db-name'};
+ return $ret;
+ }
+ }
- ask(
- -noninteractive => $opts->{"non-interactive"},
- -question => "DB hostname",
- -test => qr/\S+/,
- -answer => \$answers->{'db-host'});
+ if (defined $answers->{'db-name'}) {
+ # Try just the db-name directly, ignore db-host.
+ # This would work if tnsnames.ora already existed.
+ if ($ret = _oracle_check_connect_info($answers)) {
+ return $ret;
+ }
+ }
- ask(
- -noninteractive => $opts->{"non-interactive"},
- -question => "DB port",
- -test => qr/\d+/,
- -default => 1521,
- -answer => \$answers->{'db-port'});
+ ask(
+ -noninteractive => $opts->{"non-interactive"},
+ -question => "Database service name (SID)",
+ -test => qr/\S+/,
+ -answer => \$answers->{'db-name'}
+ );
- ask(
- -noninteractive => $opts->{"non-interactive"},
- -question => "DB protocol",
- -test => qr/\S+/,
- -default => 'TCP',
- -answer => \$answers->{'db-protocol'});
+ # Try the db-name as full connect (ignore host).
+ if ($ret = _oracle_check_connect_info($answers)) {
+ return $ret;
+ }
- return;
+ $data{'db-name'} = _oracle_make_dsn_string($answers);
+ if (not defined $data{'db-name'}) {
+ $data{'db-name'} = $answers->{'db-name'};
+ $data{'db-host'} = 'localhost';
+ $data{'db-name'} = _oracle_make_dsn_string(\%data);
+ }
+ if (defined $data{'db-name'}) {
+ # Try db-name as SID for host (//host:port/name).
+ if ($ret = _oracle_check_connect_info(\%data)) {
+ # It worked, we shall set it in place of name.
+ $answers->{'db-name'} = $data{'db-name'};
+ return $ret;
+ }
+ }
+
+ ask(
+ -noninteractive => $opts->{"non-interactive"},
+ -question => "Database hostname",
+ -test => qr/\S+/,
+ -default => 'localhost',
+ -answer => \$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).
+ if ($ret = _oracle_check_connect_info(\%data)) {
+ # It worked, we shall set it in place of name.
+ $answers->{'db-name'} = $data{'db-name'};
+ return $ret;
+ }
+ }
+
+ ask(
+ -noninteractive => $opts->{"non-interactive"},
+ -question => "Database (listener) port",
+ -test => qr/\d+/,
+ -default => '1521',
+ -answer => \$answers->{'db-port'});
+
+ $data{'db-name'} = _oracle_make_dsn_string($answers);
+ if (defined $data{'db-name'}) {
+ # Try db-name as SID for host (//host:port/name).
+ if ($ret = _oracle_check_connect_info(\%data)) {
+ # It worked, we shall set it in place of name.
+ $answers->{'db-name'} = $data{'db-name'};
+ return $ret;
+ }
+ }
+
+ print $@;
+ if (is_embedded_db($opts) or $opts->{"non-interactive"}) {
+ exit 19;
+ }
+
+ delete @{$answers}{qw/db-host db-port db-name/};
+ goto REDO_CONNECT;
}
+sub oracle_get_database_answers {
+ my $opts = shift;
+ my $answers = shift;
+
+ while (1) {
+ my $ret = oracle_get_connect_answers($opts, $answers);
+ if ($ret > 1) {
+ # Connect info was good, and even username and password were OK.
+ return;
+ }
+
+ while (1) {
+ ask(
+ -noninteractive => $opts->{"non-interactive"},
+ -question => "Username",
+ -test => qr/\S+/,
+ -answer => \$answers->{'db-user'});
+
+ ask(
+ -noninteractive => $opts->{"non-interactive"},
+ -question => "Password",
+ -test => qr/\S+/,
+ -answer => \$answers->{'db-password'},
+ -password => 1);
+
+ $ret = _oracle_check_connect_info($answers);
+ if ($ret > 1) {
+ return;
+ }
+ print $@;
+ if (is_embedded_db($opts) or $opts->{"non-interactive"}) {
+ exit 19;
+ }
+
+ if (not $ret) {
+ # We won't try username/password, need to go
+ # back to connect check loop.
+ last;
+ }
+ delete @{$answers}{qw/db-user db-password/};
+ }
+ delete @{$answers}{qw/db-host db-port db-name/};
+ }
+}
+
+
sub postgresql_get_database_answers {
my $opts = shift;
my $answers = shift;
@@ -939,7 +1079,6 @@ sub oracle_setup_embedded_db {
$answers->{'db-name'} = 'rhnsat' if not defined $answers->{'db-name'};
$answers->{'db-host'} = 'localhost';
$answers->{'db-port'} = 1521;
- $answers->{'db-protocol'} = 'TCP';
}
@@ -1028,15 +1167,6 @@ sub oracle_setup_db_connection {
while (not $connected) {
oracle_get_database_answers($opts, $answers);
- my $address = join(",", @{$answers}{qw/db-protocol db-host db-port/});
-
- system_or_exit([ "/usr/bin/rhn-config-tnsnames.pl",
- "--target=/etc/tnsnames.ora",
- "--sid=" . $answers->{'db-name'},
- "--address=$address" ],
- 18,
- "Could not update tnsnames.ora");
-
my $dbh;
eval {
@@ -1056,7 +1186,7 @@ sub oracle_setup_db_connection {
exit 19;
}
- delete @{$answers}{qw/db-protocol db-host db-port db-user db-name db-password/};
+ delete @{$answers}{qw/db-host db-port db-user db-name db-password/};
}
else {
$connected = 1;
13 years, 5 months
client/rhel
by Miroslav Suchý
client/rhel/rhn-client-tools/data/rh_register.glade | 2 +-
client/rhel/rhn-client-tools/po/ar.po | 4 ++--
client/rhel/rhn-client-tools/po/as.po | 4 ++--
client/rhel/rhn-client-tools/po/bg.po | 4 ++--
client/rhel/rhn-client-tools/po/bn.po | 4 ++--
client/rhel/rhn-client-tools/po/bn_IN.po | 4 ++--
client/rhel/rhn-client-tools/po/ca.po | 4 ++--
client/rhel/rhn-client-tools/po/cs.po | 4 ++--
client/rhel/rhn-client-tools/po/cy.po | 4 ++--
client/rhel/rhn-client-tools/po/da.po | 4 ++--
client/rhel/rhn-client-tools/po/de.po | 8 ++++----
client/rhel/rhn-client-tools/po/el.po | 4 ++--
client/rhel/rhn-client-tools/po/en_GB.po | 4 ++--
client/rhel/rhn-client-tools/po/es.po | 8 ++++----
client/rhel/rhn-client-tools/po/et.po | 4 ++--
client/rhel/rhn-client-tools/po/fa.po | 4 ++--
client/rhel/rhn-client-tools/po/fi.po | 4 ++--
client/rhel/rhn-client-tools/po/fr.po | 4 ++--
client/rhel/rhn-client-tools/po/gu.po | 4 ++--
client/rhel/rhn-client-tools/po/he.po | 4 ++--
client/rhel/rhn-client-tools/po/hi.po | 4 ++--
client/rhel/rhn-client-tools/po/hr.po | 4 ++--
client/rhel/rhn-client-tools/po/hu.po | 4 ++--
client/rhel/rhn-client-tools/po/hy.po | 4 ++--
client/rhel/rhn-client-tools/po/id.po | 4 ++--
client/rhel/rhn-client-tools/po/is.po | 4 ++--
client/rhel/rhn-client-tools/po/it.po | 8 ++++----
client/rhel/rhn-client-tools/po/ja.po | 4 ++--
client/rhel/rhn-client-tools/po/ka.po | 4 ++--
client/rhel/rhn-client-tools/po/kn.po | 4 ++--
client/rhel/rhn-client-tools/po/ko.po | 4 ++--
client/rhel/rhn-client-tools/po/ku.po | 4 ++--
client/rhel/rhn-client-tools/po/lo.po | 4 ++--
client/rhel/rhn-client-tools/po/lv.po | 4 ++--
client/rhel/rhn-client-tools/po/mk.po | 4 ++--
client/rhel/rhn-client-tools/po/ml.po | 8 ++++----
client/rhel/rhn-client-tools/po/mr.po | 4 ++--
client/rhel/rhn-client-tools/po/ms.po | 4 ++--
client/rhel/rhn-client-tools/po/my.po | 4 ++--
client/rhel/rhn-client-tools/po/nb.po | 4 ++--
client/rhel/rhn-client-tools/po/nl.po | 4 ++--
client/rhel/rhn-client-tools/po/no.po | 4 ++--
client/rhel/rhn-client-tools/po/or.po | 4 ++--
client/rhel/rhn-client-tools/po/pa.po | 4 ++--
client/rhel/rhn-client-tools/po/pl.po | 4 ++--
client/rhel/rhn-client-tools/po/pt.po | 4 ++--
client/rhel/rhn-client-tools/po/pt_BR.po | 4 ++--
client/rhel/rhn-client-tools/po/rhn-client-tools.pot | 4 ++--
client/rhel/rhn-client-tools/po/ro.po | 4 ++--
client/rhel/rhn-client-tools/po/ru.po | 8 ++++----
client/rhel/rhn-client-tools/po/si.po | 4 ++--
client/rhel/rhn-client-tools/po/sk.po | 4 ++--
client/rhel/rhn-client-tools/po/sl.po | 4 ++--
client/rhel/rhn-client-tools/po/sq.po | 4 ++--
client/rhel/rhn-client-tools/po/sr.po | 4 ++--
client/rhel/rhn-client-tools/po/sr(a)Latn.po | 4 ++--
client/rhel/rhn-client-tools/po/sv.po | 8 ++++----
client/rhel/rhn-client-tools/po/ta.po | 4 ++--
client/rhel/rhn-client-tools/po/te.po | 8 ++++----
client/rhel/rhn-client-tools/po/tr.po | 4 ++--
client/rhel/rhn-client-tools/po/uk.po | 4 ++--
client/rhel/rhn-client-tools/po/ur.po | 4 ++--
client/rhel/rhn-client-tools/po/vi.po | 4 ++--
client/rhel/rhn-client-tools/po/zh_CN.GB2312.po | 4 ++--
client/rhel/rhn-client-tools/po/zh_CN.po | 6 +++---
client/rhel/rhn-client-tools/po/zh_TW.Big5.po | 4 ++--
client/rhel/rhn-client-tools/po/zh_TW.po | 4 ++--
67 files changed, 148 insertions(+), 148 deletions(-)
New commits:
commit 36b1ac5e64f8874dc89fc1eb10c5cd8df5b70afb
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 18 16:15:45 2011 +0100
651403 - reference to RHEL6 as actuall system
This is suboptimal as this should be picked from some file/variable...
diff --git a/client/rhel/rhn-client-tools/data/rh_register.glade b/client/rhel/rhn-client-tools/data/rh_register.glade
index e0e2ebb..e8ca936 100644
--- a/client/rhel/rhn-client-tools/data/rh_register.glade
+++ b/client/rhel/rhn-client-tools/data/rh_register.glade
@@ -5356,7 +5356,7 @@ You'll know when software updates are available when a package icon appears in t
<child>
<widget class="GtkLabel" id="allUpdatesLabel">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>_All available updates</b> will be provided to this system. This system, if kept updated, will always be equivalent to the latest available minor release of Red Hat Enterprise Linux 5. It will be registered to the main 'Red Hat Enterprise Linux 5' software channel.</property>
+ <property name="label" translatable="yes"><b>_All available updates</b> will be provided to this system. This system, if kept updated, will always be equivalent to the latest available minor release of Red Hat Enterprise Linux 6. It will be registered to the main 'Red Hat Enterprise Linux 6' software channel.</property>
<property name="use_underline">True</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
diff --git a/client/rhel/rhn-client-tools/po/ar.po b/client/rhel/rhn-client-tools/po/ar.po
index 589a94a..afd2362 100644
--- a/client/rhel/rhn-client-tools/po/ar.po
+++ b/client/rhel/rhn-client-tools/po/ar.po
@@ -1574,8 +1574,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/as.po b/client/rhel/rhn-client-tools/po/as.po
index 207bd61..90bf08e 100644
--- a/client/rhel/rhn-client-tools/po/as.po
+++ b/client/rhel/rhn-client-tools/po/as.po
@@ -1688,8 +1688,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/bg.po b/client/rhel/rhn-client-tools/po/bg.po
index b28e9da..4cf3808 100644
--- a/client/rhel/rhn-client-tools/po/bg.po
+++ b/client/rhel/rhn-client-tools/po/bg.po
@@ -1603,8 +1603,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/bn.po b/client/rhel/rhn-client-tools/po/bn.po
index 5bb9eff..1c9249e 100644
--- a/client/rhel/rhn-client-tools/po/bn.po
+++ b/client/rhel/rhn-client-tools/po/bn.po
@@ -1716,8 +1716,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/bn_IN.po b/client/rhel/rhn-client-tools/po/bn_IN.po
index 109ecf6..8ea0886 100644
--- a/client/rhel/rhn-client-tools/po/bn_IN.po
+++ b/client/rhel/rhn-client-tools/po/bn_IN.po
@@ -1833,8 +1833,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/ca.po b/client/rhel/rhn-client-tools/po/ca.po
index abc45cc..89f8ffe 100644
--- a/client/rhel/rhn-client-tools/po/ca.po
+++ b/client/rhel/rhn-client-tools/po/ca.po
@@ -1607,8 +1607,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/cs.po b/client/rhel/rhn-client-tools/po/cs.po
index 0ac00ad..7164d5b 100644
--- a/client/rhel/rhn-client-tools/po/cs.po
+++ b/client/rhel/rhn-client-tools/po/cs.po
@@ -1599,8 +1599,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/cy.po b/client/rhel/rhn-client-tools/po/cy.po
index c230881..26ad82a 100644
--- a/client/rhel/rhn-client-tools/po/cy.po
+++ b/client/rhel/rhn-client-tools/po/cy.po
@@ -1588,8 +1588,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/da.po b/client/rhel/rhn-client-tools/po/da.po
index 66b673f..c942668 100644
--- a/client/rhel/rhn-client-tools/po/da.po
+++ b/client/rhel/rhn-client-tools/po/da.po
@@ -1595,8 +1595,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/de.po b/client/rhel/rhn-client-tools/po/de.po
index 6af03ba..e49a719 100644
--- a/client/rhel/rhn-client-tools/po/de.po
+++ b/client/rhel/rhn-client-tools/po/de.po
@@ -1781,14 +1781,14 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
"<b>_Alle verfügbaren Updates</b> werden diesem System zur Verfügung "
"gestellt. Dieses System - wenn es auf dem aktuellsten Stand gehalten wird - "
"wird immer dem aktuell verfügbaren Zwischen-Release von Red Hat Enterprise "
-"Linux 5 entsprechen. Es wird beim Haupt-Software-Channel für 'Red Hat "
-"Enterprise Linux 5' registriert."
+"Linux 6 entsprechen. Es wird beim Haupt-Software-Channel für 'Red Hat "
+"Enterprise Linux 6' registriert."
#: ../data/rh_register.glade.h:18
msgid ""
diff --git a/client/rhel/rhn-client-tools/po/el.po b/client/rhel/rhn-client-tools/po/el.po
index 216826c..4c934cc 100644
--- a/client/rhel/rhn-client-tools/po/el.po
+++ b/client/rhel/rhn-client-tools/po/el.po
@@ -1583,8 +1583,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/en_GB.po b/client/rhel/rhn-client-tools/po/en_GB.po
index c6ef8fa..5cc07b9 100644
--- a/client/rhel/rhn-client-tools/po/en_GB.po
+++ b/client/rhel/rhn-client-tools/po/en_GB.po
@@ -1544,8 +1544,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/es.po b/client/rhel/rhn-client-tools/po/es.po
index fc7f729..f02eda1 100644
--- a/client/rhel/rhn-client-tools/po/es.po
+++ b/client/rhel/rhn-client-tools/po/es.po
@@ -1755,13 +1755,13 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
"<b>Todas las _actualizaciones disponibles</b> serán provistas a este "
"sistema. Si se mantiene actualizado, este sistema, siempre será equivalente "
-"al lanzamiento menor más reciente de Red Hat Enterprise Linux 5. Siempre "
-"estará registrado al canal de software de 'Red Hat Enterprise Linux 5'."
+"al lanzamiento menor más reciente de Red Hat Enterprise Linux 6. Siempre "
+"estará registrado al canal de software de 'Red Hat Enterprise Linux 6'."
#: ../data/rh_register.glade.h:18
msgid ""
diff --git a/client/rhel/rhn-client-tools/po/et.po b/client/rhel/rhn-client-tools/po/et.po
index 6f1b6ee..9f2fd0a 100644
--- a/client/rhel/rhn-client-tools/po/et.po
+++ b/client/rhel/rhn-client-tools/po/et.po
@@ -1581,8 +1581,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/fa.po b/client/rhel/rhn-client-tools/po/fa.po
index 4d3bd2c..6caabf4 100644
--- a/client/rhel/rhn-client-tools/po/fa.po
+++ b/client/rhel/rhn-client-tools/po/fa.po
@@ -1464,8 +1464,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/fi.po b/client/rhel/rhn-client-tools/po/fi.po
index 5a628c2..c69f645 100644
--- a/client/rhel/rhn-client-tools/po/fi.po
+++ b/client/rhel/rhn-client-tools/po/fi.po
@@ -1579,8 +1579,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/fr.po b/client/rhel/rhn-client-tools/po/fr.po
index b150ce1..57dc3d0 100644
--- a/client/rhel/rhn-client-tools/po/fr.po
+++ b/client/rhel/rhn-client-tools/po/fr.po
@@ -1755,8 +1755,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/gu.po b/client/rhel/rhn-client-tools/po/gu.po
index 9ac390b..de52789 100644
--- a/client/rhel/rhn-client-tools/po/gu.po
+++ b/client/rhel/rhn-client-tools/po/gu.po
@@ -1677,8 +1677,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/he.po b/client/rhel/rhn-client-tools/po/he.po
index 235148b..06296ad 100644
--- a/client/rhel/rhn-client-tools/po/he.po
+++ b/client/rhel/rhn-client-tools/po/he.po
@@ -1464,8 +1464,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/hi.po b/client/rhel/rhn-client-tools/po/hi.po
index 78e0b33..022256f 100644
--- a/client/rhel/rhn-client-tools/po/hi.po
+++ b/client/rhel/rhn-client-tools/po/hi.po
@@ -1665,8 +1665,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/hr.po b/client/rhel/rhn-client-tools/po/hr.po
index 9763ff4..0fc0319 100644
--- a/client/rhel/rhn-client-tools/po/hr.po
+++ b/client/rhel/rhn-client-tools/po/hr.po
@@ -1704,8 +1704,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/hu.po b/client/rhel/rhn-client-tools/po/hu.po
index a922d2b..a754033 100644
--- a/client/rhel/rhn-client-tools/po/hu.po
+++ b/client/rhel/rhn-client-tools/po/hu.po
@@ -1601,8 +1601,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/hy.po b/client/rhel/rhn-client-tools/po/hy.po
index 575cd66..143cdba 100644
--- a/client/rhel/rhn-client-tools/po/hy.po
+++ b/client/rhel/rhn-client-tools/po/hy.po
@@ -1463,8 +1463,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/id.po b/client/rhel/rhn-client-tools/po/id.po
index b2c766f..75be837 100644
--- a/client/rhel/rhn-client-tools/po/id.po
+++ b/client/rhel/rhn-client-tools/po/id.po
@@ -1475,8 +1475,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/is.po b/client/rhel/rhn-client-tools/po/is.po
index e7dece2..78035bb 100644
--- a/client/rhel/rhn-client-tools/po/is.po
+++ b/client/rhel/rhn-client-tools/po/is.po
@@ -1576,8 +1576,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/it.po b/client/rhel/rhn-client-tools/po/it.po
index 9bc1e13..5bf7804 100644
--- a/client/rhel/rhn-client-tools/po/it.po
+++ b/client/rhel/rhn-client-tools/po/it.po
@@ -1806,13 +1806,13 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
"<b> Tutti gli _Aggiornamenti disponibili</b> verranno forniti a questo "
"sistema. Il suddetto sistema, se tenuto aggiornato, sarà sempre equivalente "
-"all'ultimissima versione minore disponibile di Red Hat Enterprise Linux 5. "
-"Esso verrà registrato sul canale software 'Red Hat Enterprise Linux 5' "
+"all'ultimissima versione minore disponibile di Red Hat Enterprise Linux 6. "
+"Esso verrà registrato sul canale software 'Red Hat Enterprise Linux 6' "
"principale."
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/ja.po b/client/rhel/rhn-client-tools/po/ja.po
index 0d3fd9e..30c1476 100644
--- a/client/rhel/rhn-client-tools/po/ja.po
+++ b/client/rhel/rhn-client-tools/po/ja.po
@@ -1779,8 +1779,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/ka.po b/client/rhel/rhn-client-tools/po/ka.po
index 0c3de1f..88b946e 100644
--- a/client/rhel/rhn-client-tools/po/ka.po
+++ b/client/rhel/rhn-client-tools/po/ka.po
@@ -1463,8 +1463,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/kn.po b/client/rhel/rhn-client-tools/po/kn.po
index 8e386ca..09dc9e2 100644
--- a/client/rhel/rhn-client-tools/po/kn.po
+++ b/client/rhel/rhn-client-tools/po/kn.po
@@ -1681,8 +1681,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/ko.po b/client/rhel/rhn-client-tools/po/ko.po
index 7726581..9b4dc86 100644
--- a/client/rhel/rhn-client-tools/po/ko.po
+++ b/client/rhel/rhn-client-tools/po/ko.po
@@ -1677,8 +1677,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/ku.po b/client/rhel/rhn-client-tools/po/ku.po
index fa43b4e..3d502bf 100644
--- a/client/rhel/rhn-client-tools/po/ku.po
+++ b/client/rhel/rhn-client-tools/po/ku.po
@@ -1463,8 +1463,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/lo.po b/client/rhel/rhn-client-tools/po/lo.po
index f6b0870..5dbaaa6 100644
--- a/client/rhel/rhn-client-tools/po/lo.po
+++ b/client/rhel/rhn-client-tools/po/lo.po
@@ -1463,8 +1463,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/lv.po b/client/rhel/rhn-client-tools/po/lv.po
index 4d3bd2c..6caabf4 100644
--- a/client/rhel/rhn-client-tools/po/lv.po
+++ b/client/rhel/rhn-client-tools/po/lv.po
@@ -1464,8 +1464,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/mk.po b/client/rhel/rhn-client-tools/po/mk.po
index e34de5d..9a930e9 100644
--- a/client/rhel/rhn-client-tools/po/mk.po
+++ b/client/rhel/rhn-client-tools/po/mk.po
@@ -1593,8 +1593,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/ml.po b/client/rhel/rhn-client-tools/po/ml.po
index 5a6af65..c4a194a 100644
--- a/client/rhel/rhn-client-tools/po/ml.po
+++ b/client/rhel/rhn-client-tools/po/ml.po
@@ -1685,12 +1685,12 @@ msgstr "<b>ഇന്സ്റ്റലേഷന് സമയത്തു
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
"<b>ലഭ്യമായ _എല്ലാ പരിഷ്കരണങ്ങളും</b> സിസ്റ്റത്തിനു് ലഭ്യമാകുന്നു. സിസ്റ്റം പരിഷ്കരിയ്ക്കുന്നതു്, "
-"Red Hat Enterprise Linux 5-ന്റെ ഏറ്റവും പുതിയ ലക്കത്തിനു് സമമാക്കുന്നു. പ്രധാന 'Red Hat "
-"Enterprise Linux 5' സോഫ്റ്റ്വെയര് ചാനലലിലേക്കു് രജിസ്ടര് ചെയ്യപ്പെടുന്നു."
+"Red Hat Enterprise Linux 6-ന്റെ ഏറ്റവും പുതിയ ലക്കത്തിനു് സമമാക്കുന്നു. പ്രധാന 'Red Hat "
+"Enterprise Linux 6' സോഫ്റ്റ്വെയര് ചാനലലിലേക്കു് രജിസ്ടര് ചെയ്യപ്പെടുന്നു."
#: ../data/rh_register.glade.h:18
msgid ""
diff --git a/client/rhel/rhn-client-tools/po/mr.po b/client/rhel/rhn-client-tools/po/mr.po
index e33c346..6a3b932 100644
--- a/client/rhel/rhn-client-tools/po/mr.po
+++ b/client/rhel/rhn-client-tools/po/mr.po
@@ -1662,8 +1662,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/ms.po b/client/rhel/rhn-client-tools/po/ms.po
index af73c78..5977c6b 100644
--- a/client/rhel/rhn-client-tools/po/ms.po
+++ b/client/rhel/rhn-client-tools/po/ms.po
@@ -1619,8 +1619,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/my.po b/client/rhel/rhn-client-tools/po/my.po
index 4d3bd2c..6caabf4 100644
--- a/client/rhel/rhn-client-tools/po/my.po
+++ b/client/rhel/rhn-client-tools/po/my.po
@@ -1464,8 +1464,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/nb.po b/client/rhel/rhn-client-tools/po/nb.po
index ea3f5dd..e36938a 100644
--- a/client/rhel/rhn-client-tools/po/nb.po
+++ b/client/rhel/rhn-client-tools/po/nb.po
@@ -1580,8 +1580,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/nl.po b/client/rhel/rhn-client-tools/po/nl.po
index c752812..ed2ed4f 100644
--- a/client/rhel/rhn-client-tools/po/nl.po
+++ b/client/rhel/rhn-client-tools/po/nl.po
@@ -1538,8 +1538,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/no.po b/client/rhel/rhn-client-tools/po/no.po
index 4ed038a..265d047 100644
--- a/client/rhel/rhn-client-tools/po/no.po
+++ b/client/rhel/rhn-client-tools/po/no.po
@@ -1594,8 +1594,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/or.po b/client/rhel/rhn-client-tools/po/or.po
index c23bf27..943fbf4 100644
--- a/client/rhel/rhn-client-tools/po/or.po
+++ b/client/rhel/rhn-client-tools/po/or.po
@@ -1681,8 +1681,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/pa.po b/client/rhel/rhn-client-tools/po/pa.po
index 9f899be..74edf26 100644
--- a/client/rhel/rhn-client-tools/po/pa.po
+++ b/client/rhel/rhn-client-tools/po/pa.po
@@ -1663,8 +1663,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/pl.po b/client/rhel/rhn-client-tools/po/pl.po
index 897054d..58afae4 100644
--- a/client/rhel/rhn-client-tools/po/pl.po
+++ b/client/rhel/rhn-client-tools/po/pl.po
@@ -1577,8 +1577,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/pt.po b/client/rhel/rhn-client-tools/po/pt.po
index c12b16f..701aa7f 100644
--- a/client/rhel/rhn-client-tools/po/pt.po
+++ b/client/rhel/rhn-client-tools/po/pt.po
@@ -1735,8 +1735,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/pt_BR.po b/client/rhel/rhn-client-tools/po/pt_BR.po
index 20fbcdf..b97e01a 100644
--- a/client/rhel/rhn-client-tools/po/pt_BR.po
+++ b/client/rhel/rhn-client-tools/po/pt_BR.po
@@ -1724,8 +1724,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/rhn-client-tools.pot b/client/rhel/rhn-client-tools/po/rhn-client-tools.pot
index 4d3bd2c..6caabf4 100644
--- a/client/rhel/rhn-client-tools/po/rhn-client-tools.pot
+++ b/client/rhel/rhn-client-tools/po/rhn-client-tools.pot
@@ -1464,8 +1464,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/ro.po b/client/rhel/rhn-client-tools/po/ro.po
index 69e562e..780b6b6 100644
--- a/client/rhel/rhn-client-tools/po/ro.po
+++ b/client/rhel/rhn-client-tools/po/ro.po
@@ -1554,8 +1554,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/ru.po b/client/rhel/rhn-client-tools/po/ru.po
index ff02fe2..3795b1e 100644
--- a/client/rhel/rhn-client-tools/po/ru.po
+++ b/client/rhel/rhn-client-tools/po/ru.po
@@ -1716,13 +1716,13 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
"<b>_Все доступные обновления</b> будут предоставлены этой системе, обеспечив "
"тем самым её соответствие последнему вспомогательному выпуску Red Hat "
-"Enterprise Linux 5. Система будет сопоставлена каналу «Red Hat Enterprise "
-"Linux 5»."
+"Enterprise Linux 6. Система будет сопоставлена каналу «Red Hat Enterprise "
+"Linux 6»."
#: ../data/rh_register.glade.h:18
msgid ""
diff --git a/client/rhel/rhn-client-tools/po/si.po b/client/rhel/rhn-client-tools/po/si.po
index bcfcd4c..e387b3e 100644
--- a/client/rhel/rhn-client-tools/po/si.po
+++ b/client/rhel/rhn-client-tools/po/si.po
@@ -1670,8 +1670,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/sk.po b/client/rhel/rhn-client-tools/po/sk.po
index c65a03f..2d01c1f 100644
--- a/client/rhel/rhn-client-tools/po/sk.po
+++ b/client/rhel/rhn-client-tools/po/sk.po
@@ -1587,8 +1587,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/sl.po b/client/rhel/rhn-client-tools/po/sl.po
index b2f4ff2..2c23fe6 100644
--- a/client/rhel/rhn-client-tools/po/sl.po
+++ b/client/rhel/rhn-client-tools/po/sl.po
@@ -1584,8 +1584,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/sq.po b/client/rhel/rhn-client-tools/po/sq.po
index ff74ba9..5e44566 100644
--- a/client/rhel/rhn-client-tools/po/sq.po
+++ b/client/rhel/rhn-client-tools/po/sq.po
@@ -1463,8 +1463,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/sr.po b/client/rhel/rhn-client-tools/po/sr.po
index 451a5cd..8668c5f 100644
--- a/client/rhel/rhn-client-tools/po/sr.po
+++ b/client/rhel/rhn-client-tools/po/sr.po
@@ -1575,8 +1575,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/sr(a)Latn.po b/client/rhel/rhn-client-tools/po/sr(a)Latn.po
index 4d3bd2c..6caabf4 100644
--- a/client/rhel/rhn-client-tools/po/sr(a)Latn.po
+++ b/client/rhel/rhn-client-tools/po/sr(a)Latn.po
@@ -1464,8 +1464,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/sv.po b/client/rhel/rhn-client-tools/po/sv.po
index c88b73b..683cb69 100644
--- a/client/rhel/rhn-client-tools/po/sv.po
+++ b/client/rhel/rhn-client-tools/po/sv.po
@@ -1737,13 +1737,13 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
"<b>_Alla tillgängliga uppdateringar</b> kommer att komma till detta system. "
"Detta system kommer, om det hålls uppdaterat, alltid vara likvärdigt med den "
-"senaste underutgåvan av Red Hat Enterprise Linux 5. Det kommer att "
-"registreras till huvudprogramvarukanalen \"Red Hat Enterprise Linux 5\"."
+"senaste underutgåvan av Red Hat Enterprise Linux 6. Det kommer att "
+"registreras till huvudprogramvarukanalen \"Red Hat Enterprise Linux 6\"."
#: ../data/rh_register.glade.h:18
msgid ""
diff --git a/client/rhel/rhn-client-tools/po/ta.po b/client/rhel/rhn-client-tools/po/ta.po
index f614208..9dd945e 100644
--- a/client/rhel/rhn-client-tools/po/ta.po
+++ b/client/rhel/rhn-client-tools/po/ta.po
@@ -1694,8 +1694,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/te.po b/client/rhel/rhn-client-tools/po/te.po
index 77af4c4..0eee49c 100644
--- a/client/rhel/rhn-client-tools/po/te.po
+++ b/client/rhel/rhn-client-tools/po/te.po
@@ -1678,12 +1678,12 @@ msgstr "<b>సంస్థాపనా సమయమందు మీ సిస్
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
"<b>(_A) అన్ని అందుబాటులోని నవీకరణలు</b> ఈ సిస్టమ్కు అందివ్వబడును. ఈ సిస్టమ్, నవీకరించుటకు "
-"వుంచబడితే, అది యెల్లప్పుడు Red Hat Enterprise Linux 5 యొక్క యిటీవలి అందుబాటులోని చిన్న "
-"విడుదలకు సమానంగా వుంచబడును. అది ముఖ్య 'Red Hat Enterprise Linux 5' సాఫ్టువేర్ చానల్కు "
+"వుంచబడితే, అది యెల్లప్పుడు Red Hat Enterprise Linux 6 యొక్క యిటీవలి అందుబాటులోని చిన్న "
+"విడుదలకు సమానంగా వుంచబడును. అది ముఖ్య 'Red Hat Enterprise Linux 6' సాఫ్టువేర్ చానల్కు "
"నమోదు కాబడును."
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/tr.po b/client/rhel/rhn-client-tools/po/tr.po
index 0ea1d6b..bb4811e 100644
--- a/client/rhel/rhn-client-tools/po/tr.po
+++ b/client/rhel/rhn-client-tools/po/tr.po
@@ -1591,8 +1591,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/uk.po b/client/rhel/rhn-client-tools/po/uk.po
index 98380db..6606bb4 100644
--- a/client/rhel/rhn-client-tools/po/uk.po
+++ b/client/rhel/rhn-client-tools/po/uk.po
@@ -1683,8 +1683,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/ur.po b/client/rhel/rhn-client-tools/po/ur.po
index 4a04e39..c082623 100644
--- a/client/rhel/rhn-client-tools/po/ur.po
+++ b/client/rhel/rhn-client-tools/po/ur.po
@@ -1463,8 +1463,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/vi.po b/client/rhel/rhn-client-tools/po/vi.po
index 4d3bd2c..6caabf4 100644
--- a/client/rhel/rhn-client-tools/po/vi.po
+++ b/client/rhel/rhn-client-tools/po/vi.po
@@ -1464,8 +1464,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po b/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
index 7139599..849a7a2 100644
--- a/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
+++ b/client/rhel/rhn-client-tools/po/zh_CN.GB2312.po
@@ -1554,8 +1554,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/zh_CN.po b/client/rhel/rhn-client-tools/po/zh_CN.po
index 7982b1f..eb1d65a 100644
--- a/client/rhel/rhn-client-tools/po/zh_CN.po
+++ b/client/rhel/rhn-client-tools/po/zh_CN.po
@@ -1602,11 +1602,11 @@ msgstr "<b>在安装过程中已将您的系统注册了更新。</b>"
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
"经为这个系统提供<b>所有可用更新(_A)</b>。如果一直更新则这个系统将总是等同于"
-"红帽企业版 Linux 5 的最新可用次要版本。要将其在主要‘红帽就企业版 Linux 5’软件"
+"红帽企业版 Linux 6 的最新可用次要版本。要将其在主要‘红帽就企业版 Linux 6’软件"
"频道中注册。"
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/zh_TW.Big5.po b/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
index 894e2d9..b668988 100644
--- a/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
+++ b/client/rhel/rhn-client-tools/po/zh_TW.Big5.po
@@ -1604,8 +1604,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
diff --git a/client/rhel/rhn-client-tools/po/zh_TW.po b/client/rhel/rhn-client-tools/po/zh_TW.po
index 70a0450..c5398df 100644
--- a/client/rhel/rhn-client-tools/po/zh_TW.po
+++ b/client/rhel/rhn-client-tools/po/zh_TW.po
@@ -1615,8 +1615,8 @@ msgstr ""
msgid ""
"<b>_All available updates</b> will be provided to this system. This system, "
"if kept updated, will always be equivalent to the latest available minor "
-"release of Red Hat Enterprise Linux 5. It will be registered to the main "
-"'Red Hat Enterprise Linux 5' software channel."
+"release of Red Hat Enterprise Linux 6. It will be registered to the main "
+"'Red Hat Enterprise Linux 6' software channel."
msgstr ""
#: ../data/rh_register.glade.h:18
13 years, 5 months
2 commits - client/rhel client/tools
by Miroslav Suchý
client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py | 3 ---
client/tools/rhncfg/config_management/rhncfg_diff.py | 3 +++
2 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit fe04ad67075c5e58a4105f797dd54a860b17b643
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 18 15:11:12 2011 +0100
628920 - rhel4 does not support selinux
diff --git a/client/tools/rhncfg/config_management/rhncfg_diff.py b/client/tools/rhncfg/config_management/rhncfg_diff.py
index da5dcdd..f89ab62 100644
--- a/client/tools/rhncfg/config_management/rhncfg_diff.py
+++ b/client/tools/rhncfg/config_management/rhncfg_diff.py
@@ -144,6 +144,9 @@ class Handler(handler_base.HandlerBase):
pass
file_stat = os.lstat(local_file)
local_info = r.make_stat_info(local_file, file_stat)
+ # rhel4 do not support selinux
+ if not 'selinux_ctx' in local_info:
+ local_info['selinux_ctx'] = ''
if not first_row and not self.__attributes_differ(info, local_info):
return ""
else:
commit 0659348d825652af6dd03a8f89ef1abffab16251
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 18 15:02:27 2011 +0100
dead code: removal of function foobar()
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
index 9aae28f..cffc917 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rpcServer.py
@@ -27,9 +27,6 @@ def stdoutMsgCallback(msg):
class RetryServer(rpclib.Server):
- def foobar(self):
- pass
-
def addServerList(self, serverList):
self.serverList = serverList
13 years, 5 months
backend/server
by Miroslav Suchý
backend/server/handlers/xmlrpc/registration.py | 8 ++++----
backend/server/rhnUser.py | 1 +
2 files changed, 5 insertions(+), 4 deletions(-)
New commits:
commit a43f0d390ee285734970d648d89bc3b92336c2d1
Author: Miroslav Suchý <msuchy(a)redhat.com>
Date: Tue Jan 18 13:27:16 2011 +0100
670458 - check password policy only if we are really going to reserve user
diff --git a/backend/server/handlers/xmlrpc/registration.py b/backend/server/handlers/xmlrpc/registration.py
index f95b847..e2df9d3 100644
--- a/backend/server/handlers/xmlrpc/registration.py
+++ b/backend/server/handlers/xmlrpc/registration.py
@@ -123,14 +123,14 @@ class Registration(rhnHandler):
"""
Get an username and a password and create a record for this user.
Eventually mark it as such.
+ Additionaly this method is used to verify login and password in early
+ stage of rhn_register.
Returns true value if user is reserved, otherwise fault is raised.
"""
-
log_debug(1, username)
- # validate the arguments
- username, password = rhnUser.check_user_password(username, password)
- # now try to reserve the user
+ # check user login/password and if not CFG.disallow_user_creation
+ # then reserver the user
ret = rhnUser.reserve_user(username, password)
log_debug(3, "rhnUser.reserve_user returned: " + str(ret))
if ret < 0:
diff --git a/backend/server/rhnUser.py b/backend/server/rhnUser.py
index 7a79e53..ee90e5a 100644
--- a/backend/server/rhnUser.py
+++ b/backend/server/rhnUser.py
@@ -472,6 +472,7 @@ def __reserve_user_db(user, password):
# user doesn't exist. now we fail, instead of reserving user.
if CFG.disallow_user_creation:
raise rhnFault(2001)
+ user, password = check_user_password(user, password)
# now check the reserved table
h = rhnSQL.prepare("""
13 years, 5 months