client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py | 28 ----
client/rhel/rhn-client-tools/src/up2date_client/tui.py | 68 ----------
2 files changed, 1 insertion(+), 95 deletions(-)
New commits:
commit c3df22849af1643ee4f1bdc460ceeda1cf61bede
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 17:11:53 2010 +0200
Remove no longer used constants.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
index 37acd17..b433907 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/rhnreg_constants.py
@@ -55,9 +55,6 @@ WHY_REGISTER_TIP = _("Tip: Red Hat values your privacy:
"
"http://www.redhat.com/legal/privacy_statement.html")
BACK_REGISTER = _("Take me back to the setup process.")
-# Privacy Window
-TERMS_AND_CONDS_WINDOW = _("Review the Red Hat Network Terms And Conditions")
-
# Confirm Quit Window
CONFIRM_QUIT = _("Software update setup unsuccessful")
CONFIRM_QUIT_SURE = _("Are you sure you don't want to connect your system
to Red Hat Network? "
@@ -89,24 +86,6 @@ EMAIL = _("*Email Address:")
SYSTEM_ALREADY_REGISTERED = _("It appears this system has already been set up for
software updates:")
SYSTEM_ALREADY_REGISTERED_CONT = _("Are you sure you would like to continue?")
-# Subscription window.
-SUBSCRIPTION_WINDOW = _("Access a subscription")
-SUBSCRIPTION_INTRO = _("Your system will need to access a subscription. "
- "This will allow you to keep your system updated,
secure, and supported.")
-SUBSCRIPTION_INFO = _("You have no active subscriptions available in your
"
- "account. You will need to do one of the following to
create an active "
- "subscription in your account before this system can
connect to "
- "Red Hat Network:")
-SUBSCRIPTION_CHOICE1 = _("Log in to
http://rhn.redhat.com/ and unentitle an
inactive system at "
- "Your RHN > Subscription Management > System
Entitlements.")
-SUBSCRIPTION_CHOICE2 = _("Purchase an additional Red Hat Enterprise Linux
subscription at "
- "http://www.redhat.com/store/.")
-SUBSCRIPTION_CHOICE3 = _("Activate a new subscription with an installation
number:")
-SUBSCRIPTION_CHOICE3_ALT = _("You have already activated this "
- "installation number during this
registration.")
-ENTITLEMENT_NUM_PROMPT = _("Installation Number:")
-ENTITLEMENT_NUM_EXAMPLE = _("Example: XXXX-XXXX-XXXX-XXXX")
-
# Send Window
SEND_WINDOW = _("We are finished collecting information for the System
Profile.\n\n"
"Press \"Next\" to send this System Profile to
Red Hat Network. "
@@ -129,7 +108,6 @@ FINISH_WINDOW_TEXT_TUI = _("You may now run 'yum update'
from this system's "
# Review Window
REVIEW_WINDOW = _("Review system subscription details")
REVIEW_WINDOW_PROMPT = _("Please review the subscription details below:")
-SUBSCRIPTIONS = _("Subscriptions Activated:")
SUB_NUM = _("The installation number %s was activated during "
"this system's initial connection to Red Hat
Network.")
SUB_NUM_RESULT = _("Subscriptions have been activated for the following
"
@@ -234,15 +212,9 @@ INST_NUM_ON_DISK = _("A subscription-activating
installation number was f
"active subscription slots available in the rhn account
instead. You may wish "
"to contact Red Hat customer service regarding this
issue: "
"http://www.redhat.com/apps/support/")
-INST_NUM_ON_DISK_NA = _("A installation number was found on disk, but we "
+
- "were not able to activate it (An unknown error
occurred.) We used existing " +
- "active subscription slots available in the rhn account
instead. You may wish " +
- "to contact Red Hat customer service regarding this
issue: " +
- "http://www.redhat.com/apps/support/")
# Error Messages.
FATAL_ERROR = _("Fatal Error")
-RECOVERABLE_ERROR = _("Error")
WARNING = _("Warning")
HOSTED_CONNECTION_ERROR = _("We can't contact the Red Hat Network
Server.\n\n"
"Double check the location provided - is '%s'
correct?\n"
commit 0d7cb8f3eade57019893f60f1df37640e660ee73
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 16:49:40 2010 +0200
RecoverableErrorWindow no longer used in TUI, removing.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index c9abbac..ba9282f 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -46,10 +46,6 @@ def FatalErrorWindow(screen, errmsg):
screen.finish()
sys.exit(1)
-def RecoverableErrorWindow(screen, errmsg):
- snack.ButtonChoiceWindow(screen, RECOVERABLE_ERROR, "%s" % errmsg,
- [OK])
-
def ConfirmQuitWindow(screen):
button = snack.ButtonChoiceWindow(screen, CONFIRM_QUIT,
CONFIRM_QUIT_SURE + "\n" + \
commit 8c0d13faccdb799d2c62132b97fa5e5cf094ecc0
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 16:48:28 2010 +0200
Remove attributes of Tui that are no longer used.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index 12b8d61..c9abbac 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -1059,30 +1059,17 @@ class Tui:
"country" : "",
}
- self.activate_result = {}
- self.invalid_num_on_disk = 0
self.other = {}
self.other['registration_number'] = ''
self.profileName = ""
self.includeHardware = 1
- self.hostname = ""
- self.ip = ""
- self.cpu = ""
- self.speed = 0
- self.ram = ""
- self.os_release = ""
- self.activated_now = 0
- self.non_entitling_num_on_disk = 0
self.limited_updates_button = 1
self.all_updates_button = 0
self.includePackages = 0
self.packageList = []
self.selectedPackages = []
- self.read_reg_num = None
-
- self.saw_sub_window = 0
def _activate_hardware(self):
@@ -1106,7 +1093,6 @@ class Tui:
self.other['registration_number'] = \
activateHWResult.getRegistrationNumber()
rhnreg.writeHWCode(self.other['registration_number'])
- self.activated_now = 1
except up2dateErrors.NotEntitlingError:
log.log_debug('There are are no entitlements associated '
'with this hardware.')
commit 16fc993c75caf0e778e668aa147d359c28070e54
Author: Jan Pazdziora <jpazdziora(a)redhat.com>
Date: Mon Mar 29 16:44:52 2010 +0200
No installation number activation, remove.
diff --git a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
index d6ae2d6..12b8d61 100644
--- a/client/rhel/rhn-client-tools/src/up2date_client/tui.py
+++ b/client/rhel/rhn-client-tools/src/up2date_client/tui.py
@@ -921,55 +921,7 @@ class ReviewWindow:
# Build up the review_window_text based on the data in self.reg_info
review_window_text = REVIEW_WINDOW_PROMPT + "\n\n"
-
- if self.tui.other['registration_number'] and \
- not self.tui.non_entitling_num_on_disk and \
- not self.tui.invalid_num_on_disk:
- review_window_text += SUBSCRIPTIONS + "\n"
-
- # Test if we successfully activated an installation number
- if self.tui.activate_result.getStatus() == \
- rhnreg.ActivationResult.ACTIVATED_NOW:
-
- # Say we activated the #, and what it activated.
- review_window_text += SUB_NUM % \
- self.tui.other['registration_number'] +
"\n\n"
-
- channels = self.tui.activate_result.getChannelsActivated()
- system_slots = self.tui.activate_result.getSystemSlotsActivated()
- log.log_debug('channels is %s' % channels)
- log.log_debug('slots is %s' % system_slots)
-
- seen = 0
- text = ""
- for channel in channels.keys():
- seen = 1
- text += channel + _(", quantity:") + \
- str(channels[channel]) + "\n"
-
- for system_slot in system_slots.keys():
- seen = 1
- text += system_slot + _(", quantity:") + \
- str(system_slots[system_slot]) + "\n"
-
- if seen:
- review_window_text += SUB_NUM_RESULT + "\n\n"
- review_window_text += text + "\n\n"
-
- # This is the case where we read the num from disk and it was
- # already activated.
- elif self.tui.activate_result.getStatus() == \
- rhnreg.ActivationResult.ALREADY_USED and \
- self.tui.read_reg_num:
- review_window_text += INST_NUM_ON_DISK + "\n\n"
-
- elif self.tui.read_reg_num and len(self.tui.read_reg_num) > 0 and \
- not self.tui.non_entitling_num_on_disk and \
- not self.tui.invalid_num_on_disk:
- # If we get here, it means we read a # off disk, but it wasn't a
- # valid num
- review_window_text += INST_NUM_ON_DISK_NA + "\n\n"
-
+
# Create and add the text for what channels the system was
# subscribed to.
if len(self.reg_info['channels']) > 0: