diff --git a/data/rh_register.glade b/data/rh_register.glade index 370d27ce4d..c54e7afefa 100644 --- a/data/rh_register.glade +++ b/data/rh_register.glade @@ -3047,7 +3047,7 @@ To keep your system updated, secure, and supported, please register this system True A security certificate compatible with <b>%s</b> was not found on this system. -A security certificate, using SSL technology, is necessary to ensure that data communicated between this system and Spacewalk (including your login and password) is secure. +A security certificate, using SSL technology, is necessary to ensure that data communicated between this system and Red Hat Satellite (including your login and password) is secure. False True GTK_JUSTIFY_LEFT @@ -3088,7 +3088,7 @@ A security certificate, using SSL technology, is necessary to ensure that data c True - I have an <b>_SSL certificate</b> to communicate with Spacewalk: + I have an <b>_SSL certificate</b> to communicate with Red Hat Satellite: True True GTK_JUSTIFY_LEFT @@ -3465,7 +3465,7 @@ A security certificate, using SSL technology, is necessary to ensure that data c False True - I would like to connect to Spacewalk via an _HTTP proxy. + I would like to connect to Red Hat Satellite via an _HTTP proxy. @@ -4639,7 +4639,7 @@ Are you sure you would like to continue? True - <b>Spacewalk Location:</b> + <b>Red Hat Satellite Location:</b> False True GTK_JUSTIFY_LEFT diff --git a/man/en/rhn-profile-sync.8 b/man/en/rhn-profile-sync.8 index da503f4ab9..149c67c964 100644 --- a/man/en/rhn-profile-sync.8 +++ b/man/en/rhn-profile-sync.8 @@ -16,7 +16,7 @@ .TH RHN-PROFILE-SYNC 8 "2010 August 30" "Linux" "Red Hat, Inc." .SH NAME -rhn-profile-sync \- Update system information on Spacewalk server. +rhn-profile-sync \- Update system information on Red Hat Satellite server. .SH SYNOPSIS @@ -26,8 +26,7 @@ rhn-profile-sync [\fIoptions\fP] .PP \fBrhn-profile-sync\fP is a client program that connects to -"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP" -and refreshes the data stored for this system. +"\fBRed Hat Satellite\fP" and refreshes the data stored for this system. .PP \fBrhn-profile-sync\fP updates data about installed packages, machine hardware, and virtual guest instances (if virtualization is enabled). diff --git a/man/en/rhn_check.8 b/man/en/rhn_check.8 index 4b0a578f6d..e9e52047f7 100644 --- a/man/en/rhn_check.8 +++ b/man/en/rhn_check.8 @@ -26,10 +26,9 @@ rhn_check [\fIoptions\fP] .PP \fBrhn_check\fP is a client program that connects to -"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or -"\fBRed Hat Network Classic\fP" and receives queued actions for this particular system. +"\fBRed Hat Satellite\fP" and receives queued actions for this particular system. After receiving the actions, \fBrhn_check\fP will then process them, and -return the results to Spacewalk. +return the results to Red Hat Satellite. .SH OPTIONS @@ -57,7 +56,7 @@ Show a help message and exit. .IP \fI/etc/sysconfig/rhn/systemid\fP The digital server ID for this machine if the system has been registered onto -"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP". +"\fBRed Hat Satellite\fP". This file does not exist otherwise. .br .IP \fI/etc/sysconfig/rhn/up2date\fP diff --git a/man/en/rhn_register.8 b/man/en/rhn_register.8 index ea349ad89c..84e2861789 100644 --- a/man/en/rhn_register.8 +++ b/man/en/rhn_register.8 @@ -15,7 +15,7 @@ .\" .TH RHN_REGISTER 8 "2011 February 4" "Linux" "Red Hat, Inc." .SH NAME -rhn_register \- Connect to Spacewalk Server, Red Hat Satellite or Red Hat Network Classic. +rhn_register \- Connect to Red Hat Satellite. .SH SYNOPSIS rhn_register [\fIoptions\fP] @@ -24,8 +24,7 @@ rhn_register [\fIoptions\fP] .PP \fBrhn_register\fP is a client program that registers your system with -"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or -"\fBRed Hat Network Classic\fP". After registering, your system can receive +"\fBRed Hat Satellite\fP". After registering, your system can receive software updates, install new software, and remotely manage your system. It can run both in graphical and text modes. @@ -58,8 +57,7 @@ Show a help message and exit. .IP \fI/etc/sysconfig/rhn/systemid\fP The digital server ID for this machine if the system has been registered onto -"\fBSpacewalk Server\fP" or "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP". -This file does not exist otherwise. +"\fBRed Hat Satellite\fP". This file does not exist otherwise. .br .IP \fI/etc/sysconfig/rhn/up2date\fP The common configuration file used by Red Hat client programs. diff --git a/man/en/rhnreg_ks.8 b/man/en/rhnreg_ks.8 index eda9d70d80..0839467d31 100644 --- a/man/en/rhnreg_ks.8 +++ b/man/en/rhnreg_ks.8 @@ -16,7 +16,7 @@ .TH RHNREG_KS 8 "2011 February 4" "Linux" "Red Hat, Inc." .SH NAME -rhnreg_ks \- A program for non interactively registering systems to Spacewalk Server, Red Hat Satellite or Red Hat Network Classic. +rhnreg_ks \- A program for non interactively registering systems to Red Hat Satellite. .SH SYNOPSIS @@ -24,7 +24,7 @@ rhnreg_ks [\fIoptions\fP] .SH DESCRIPTION .PP -\fVrhnreg_ks\fR is a utility for registering a system with the "\fVSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP". It is designed to be used in +\fVrhnreg_ks\fR is a utility for registering a system with the "\fBRed Hat Satellite\fP". It is designed to be used in a non-interactive environment (a kickstart style install, for example). All the information can be specified on the command line or stdin. @@ -32,10 +32,10 @@ All the information can be specified on the command line or stdin. .IP "\fB--profilename\fP" Specify the profile name that should be used as an identifier for -the system in Spacewalk Server, Red Hat Satellite or Red Hat Network Classic +the system in Red Hat Satellite .br .IP "\fB--username\fP" -The username to register the system with under Spacewalk Server, Red Hat Satellite or Red Hat Network Classic. This can be an existing Spacewalk, Red Hat Satellite or Red Hat Network Classic username, or a new username. +The username to register the system with under Red Hat Satellite. This can be an existing Red Hat Satellite username, or a new username. .br .IP "\fB--password\fP" The password associated with the username specified with the \fB--username\fR @@ -93,7 +93,7 @@ Show a help message and exit. .IP \fI/etc/sysconfig/rhn/systemid\fP The digital server ID for this machine if the system has been registered onto -"\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP". +"\fBRed Hat Satellite\fP". This file does not exist otherwise. .br .IP \fI/etc/sysconfig/rhn/up2date\fP @@ -101,7 +101,7 @@ The common configuration file used by RHN client programs. .SH "EXAMPLES" -Register a new system to Spacewalk / Red Hat Satellite / Red Hat Network Classic: +Register a new system to Red Hat Satellite: .RS .nf diff --git a/man/en/spacewalk-channel.8 b/man/en/spacewalk-channel.8 index 3bac732826..94c52269b8 100644 --- a/man/en/spacewalk-channel.8 +++ b/man/en/spacewalk-channel.8 @@ -24,7 +24,7 @@ spacewalk-channel [\fIoptions\fP] .SH DESCRIPTION .PP -\fVspacewalk-channel\fR allows you to subscribe to and unsubscribe from specified channels via the command line. A visit to the "\fBSpacewalk Server\fP", "\fBRed Hat Satellite\fP" or "\fBRed Hat Network Classic\fP" website isn't required. +\fVspacewalk-channel\fR allows you to subscribe to and unsubscribe from specified channels via the command line. A visit to the "\fBRed Hat Satellite\fP" website isn't required. .SH OPTIONS @@ -44,7 +44,7 @@ You are subscribing system to given channel(s). You have to specify --user and - You are unsubscribing system to given channel(s). You have to specify --user and --password. .br .IP "\fB-u, --user\fP" -Your username used to register the system with and for Red Hat Network Classic, Red Hat Satellite or Spacewalk. +Your username used to register the system with and for Red Hat Satellite. If you do not enter this option and it is required, you will be prompted. .br .IP "\fB-p, --password\fP" diff --git a/man/en/up2date.5 b/man/en/up2date.5 index a3399006cf..9db4a60533 100644 --- a/man/en/up2date.5 +++ b/man/en/up2date.5 @@ -16,12 +16,12 @@ .TH "UP2DATE" "5" "2010 August 30" "Linux" "Red Hat, Inc." .SH NAME -up2date \- Configuration file for Spacewalk client programs. +up2date \- Configuration file for Red Hat Satellite client programs. .SH DESCRIPTION .PP -Spacewalk client programs, such as \fBrhn_check(8)\fR, use a common +Red Hat Satellite client programs, such as \fBrhn_check(8)\fR, use a common configuration file at \fI/etc/sysconfig/rhn/up2date\fR. .SH OPTIONS diff --git a/rhn-client-tools.spec b/rhn-client-tools.spec index e9eab86d7f..96e264f853 100644 --- a/rhn-client-tools.spec +++ b/rhn-client-tools.spec @@ -1,11 +1,11 @@ -Summary: Support programs and libraries for Red Hat Satellite or Spacewalk +Summary: Support programs and libraries for Red Hat Satellite License: GPLv2 Group: System Environment/Base Source0: https://fedorahosted.org/releases/s/p/spacewalk/%{name}-%{version}.tar.gz URL: https://fedorahosted.org/spacewalk Name: rhn-client-tools Version: 2.0.2 -Release: 6%{?dist} +Release: 7%{?dist} BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n) BuildArch: noarch %if 0%{?suse_version} @@ -73,7 +73,7 @@ BuildRequires: rpm-python %description Red Hat Satellite Client Tools provides programs and libraries to allow your -system to receive software updates from Red Hat Satellite or Spacewalk. +system to receive software updates from Red Hat Satellite. %package -n rhn-check Summary: Check for RHN actions @@ -86,11 +86,11 @@ Requires: yum-rhn-plugin >= 1.6.4-1 %endif %description -n rhn-check -rhn-check polls a Red Hat Satelliteor Spacewalk server to find and execute +rhn-check polls a Red Hat Satellite server to find and execute scheduled actions. %package -n rhn-setup -Summary: Configure and register an RHN/Spacewalk client +Summary: Configure and register an Red Hat Satellite client Group: System Environment/Base Requires: usermode >= 1.36 Requires: %{name} = %{version}-%{release} @@ -104,10 +104,10 @@ Requires: newt-python %description -n rhn-setup rhn-setup contains programs and utilities to configure a system to use -Red Hat Satellite or Spacewalk, and to register a system with a Red Hat Satellite or Spacewalk server. +Red Hat Satellite and to register a system with a Red Hat Satellite server. %package -n rhn-setup-gnome -Summary: A GUI interface for RHN/Spacewalk Registration +Summary: A GUI interface for Red Hat Satellite Registration Group: System Environment/Base Requires: %{name} = %{version}-%{release} Requires: rhn-setup = %{version}-%{release} @@ -125,7 +125,7 @@ Requires: liberation-sans-fonts %description -n rhn-setup-gnome rhn-setup-gnome contains a GTK+ graphical interface for configuring and -registering a system with a Red Hat Satellite or Spacewalk server. +registering a system with a Red Hat Satellite server. %prep @@ -361,6 +361,12 @@ make -f Makefile.rhn-client-tools test %endif %changelog +* Mon Jun 06 2016 Tomas Kasparek 2.0.2-7 +- Resolves: #1262780 - alow to use existing rpcServer when creating RhnServer + (jdobes@redhat.com) +- Resolves: #1292036 - don't mention Spacewalk in rhn-client-tools + (tkasparek@redhat.com) + * Wed Sep 17 2014 Stephen Herr 2.0.2-6 - allow unicode characters in proxy username / password (mzazrivec@redhat.com) diff --git a/rhn_register.desktop.in b/rhn_register.desktop.in index 4ce8863721..ab8953008d 100644 --- a/rhn_register.desktop.in +++ b/rhn_register.desktop.in @@ -1,8 +1,8 @@ [Desktop Entry] Encoding=UTF-8 _Name=Satellite Registration -_GenericName=Register for software updates from Spacewalk/Red Hat Satellite/Red Hat Network Classic -_Comment=Register to Spacewalk/Red Hat Satellite/Red Hat Network Classic. +_GenericName=Register for software updates from Red Hat Satellite +_Comment=Register to Red Hat Satellite. Exec=rhn_register Icon=up2date Terminal=false diff --git a/src/bin/rhn-profile-sync.py b/src/bin/rhn-profile-sync.py index 57ecaf4350..6eab065681 100644 --- a/src/bin/rhn-profile-sync.py +++ b/src/bin/rhn-profile-sync.py @@ -1,13 +1,13 @@ #!/usr/bin/python # -# Spacewalk registration tool +# Red Hat Satellite registration tool # Adapted from wrapper.py # Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPLv2. # # Authors: # Adrian Likins # Preston Brown -# James Bowes +# James Bowes import sys @@ -25,7 +25,7 @@ from up2date_client import rhnHardware try: from virtualization import support except ImportError: - support = None + support = None class ProfileCli(rhncli.RhnCli): @@ -42,10 +42,10 @@ class ProfileCli(rhncli.RhnCli): print _("Updating package profile...") rhnPackageInfo.updatePackageProfile() - + print _("Updating hardware profile...") rhnHardware.updateHardware() - + if support is not None: print _("Updating virtualization profile...") support.refresh(True) diff --git a/src/bin/rhn_check.py b/src/bin/rhn_check.py index 6376a0143b..ebe282cba4 100755 --- a/src/bin/rhn_check.py +++ b/src/bin/rhn_check.py @@ -1,7 +1,7 @@ #!/usr/bin/python # # Python client for checking periodically for posted actions -# on the Spacewalk servers. +# on the Red Hat Satellite servers. # # Copyright (c) 2000--2012 Red Hat, Inc. # diff --git a/src/bin/rhn_register.py b/src/bin/rhn_register.py index 63c22937aa..6059498217 100644 --- a/src/bin/rhn_register.py +++ b/src/bin/rhn_register.py @@ -1,13 +1,13 @@ #!/usr/bin/python # -# Spacewalk / Red Hat Network Classic registration tool +# Red Hat Satellite registration tool # Adapted from wrapper.py # Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPLv2. # # Authors: # Adrian Likins # Preston Brown -# James Bowes +# James Bowes # Daniel Benamy import sys @@ -29,7 +29,6 @@ from up2date_client import up2dateErrors class RhnRegister(rhncli.RhnCli): """Runs rhn_register. Can run it in gui or tui mode depending on availablility of gui, DISPLAY environment variable, and --nox switch. - """ def __init__(self): super(RhnRegister, self).__init__() @@ -46,13 +45,12 @@ class RhnRegister(rhncli.RhnCli): return gui except: pass - + return tui def main(self): """RhnCli (the base class) just sets stuff up and then calls this to run the rest of the program. - """ ui = self._get_ui() ui.main() @@ -64,7 +62,7 @@ class RhnRegister(rhncli.RhnCli): sys.exit(1) except up2dateErrors.RhnServerException: sys.exit(1) - + # Assuming registration worked, remember to save info (proxy setup,etc) # from rhncli self.saveConfig() diff --git a/src/bin/rhnreg_ks.py b/src/bin/rhnreg_ks.py index 98307f4d58..5ea0798060 100755 --- a/src/bin/rhnreg_ks.py +++ b/src/bin/rhnreg_ks.py @@ -1,13 +1,13 @@ #!/usr/bin/python # -# Registration client for the Spacewalk for useage with kickstart +# Registration client for the Red Hat Satellite for useage with kickstart # Copyright (c) 1999--2012 Red Hat, Inc. Distributed under GPLv2. # # Authors: # Adrian Likins # James Bowes # -# see the output of "--help" for the valid options. +# see the output of "--help" for the valid options. # # The contact info is in the form or a "key: value" one per line. # valid keys are: diff --git a/src/up2date_client/rhncli.py b/src/up2date_client/rhncli.py index 90c7ad6211..8a92cee465 100644 --- a/src/up2date_client/rhncli.py +++ b/src/up2date_client/rhncli.py @@ -209,7 +209,7 @@ class RhnCli(object): @staticmethod def __versionString(): - versionString = _("%%prog (Spacewalk Client Tools) %s\n" + versionString = _("%%prog (RHN Client Tools) %s\n" "Copyright (C) 1999--2012 Red Hat, Inc.\n" "Licensed under the terms of the GPLv2.") % up2dateUtils.version() return versionString diff --git a/src/up2date_client/rhnregGui.py b/src/up2date_client/rhnregGui.py index 2c2ca5e7bf..b3f000c94c 100644 --- a/src/up2date_client/rhnregGui.py +++ b/src/up2date_client/rhnregGui.py @@ -301,7 +301,7 @@ class ChooseServerPage: serverType = rhnreg.getServerType() NEED_SERVER_MESSAGE = _("You will not be able to successfully register " - "this system without contacting a Spacewalk server.") + "this system without contacting a Red Hat Satellite server.") # Try to contact the server to see if we have a good cert try: @@ -336,7 +336,7 @@ class ChooseServerPage: log.log_exception(*sys.exc_info()) dialog = messageWindow.BulletedOkDialog() - dialog.add_text(_("There was an error communicating with Spacewalk server.")) + dialog.add_text(_("There was an error communicating with Red Hat Satellite server.")) dialog.add_bullet(_("The server may be in outage mode. You may have to try " "connecting later.")) dialog.add_bullet(_("You may be running a client that is incompatible with " @@ -372,7 +372,7 @@ class LoginPage: tipIconSatellite = self.loginXml.get_widget('tipIconSatellite') server = config.getServerlURL()[0] protocol, host, path, parameters, query, fragmentIdentifier = urlparse.urlparse(server) - satelliteText = _("Please enter your account information for the %s Spacewalk server:") % host + satelliteText = _("Please enter your account information for the %s Red Hat Satellite server:") % host instructionsLabel.set_label(satelliteText) #forgotInfoSatellite.show() #tipIconSatellite.show() diff --git a/src/up2date_client/rhnreg_constants.py b/src/up2date_client/rhnreg_constants.py index ced47b59da..d7694382cf 100644 --- a/src/up2date_client/rhnreg_constants.py +++ b/src/up2date_client/rhnreg_constants.py @@ -26,9 +26,9 @@ SSL_REQUIRED = _("If you are using https you must enter the location " "of a valid SSL certificate.") # Connect Window -CONNECT_WINDOW = _("Attempting to contact the Spacewalk server.") +CONNECT_WINDOW = _("Attempting to contact the Red Hat Satellite server.") CONNECT_WINDOW_TEXT = _("We are attempting to contact the Red Hat " - "Network server at %s.") + "Satellite server at %s.") CONNECT_WINDOW_TEXT2 = _("A proxy was specified at %s.") # Start Window diff --git a/src/up2date_client/rhnserver.py b/src/up2date_client/rhnserver.py index 7f685e014e..6f232d8b07 100644 --- a/src/up2date_client/rhnserver.py +++ b/src/up2date_client/rhnserver.py @@ -166,9 +166,12 @@ class RhnServer(object): level exceptions """ - def __init__(self, serverOverride=None, timeout=None): - self._server = rpcServer.getServer(serverOverride=serverOverride, - timeout=timeout) + def __init__(self, serverOverride=None, timeout=None, rpcServerOverride=None): + if rpcServerOverride is None: + self._server = rpcServer.getServer(serverOverride=serverOverride, + timeout=timeout) + else: + self._server = rpcServerOverride self._capabilities = None def __get_capabilities(self): diff --git a/src/up2date_client/tui.py b/src/up2date_client/tui.py index 96f58ccdad..35fd3fa050 100644 --- a/src/up2date_client/tui.py +++ b/src/up2date_client/tui.py @@ -131,7 +131,7 @@ class AlreadyRegisteredWindow: tb = snack.Textbox(size[0]-30, size[1]-20, (SYSTEM_ALREADY_REGISTERED + "\n\n" - + _("Spacewalk Location:") + " " + convert_url_from_pune(self.tui.serverURL) + "\n" + + _("Red Hat Satellite Location:") + " " + convert_url_from_pune(self.tui.serverURL) + "\n" + _("Login:") + " " + oldUsername + "\n" + _("System ID:") + " " + oldsystemId + "\n\n" + SYSTEM_ALREADY_REGISTERED_CONT + "\n").encode('utf-8'), diff --git a/src/up2date_client/up2dateErrors.py b/src/up2date_client/up2dateErrors.py index 498add0017..39f9185404 100644 --- a/src/up2date_client/up2dateErrors.py +++ b/src/up2date_client/up2dateErrors.py @@ -60,7 +60,7 @@ class Error(YumBaseError): return self.value def __getattr__(self, name): - """ Spacewalk backend still use errmsg, let have errmsg as alias to value """ + """ Red Hat Satellite backend still use errmsg, let have errmsg as alias to value """ if name == 'errmsg': return self.value else: @@ -74,7 +74,7 @@ class Error(YumBaseError): raise AttributeError(_("class %s has no attribute '%s'") % (self.__class__.__name__, name)) def __setattr__(self, name, value): - """ Spacewalk backend still use errmsg, let have errmsg as alias to value """ + """ Red Hat Satellite backend still use errmsg, let have errmsg as alias to value """ if name == 'errmsg': self.__dict__['value'] = value else: