FAQ Search Today's Posts Mark Forums Read
» Video Reviews

» Linux Archive

Linux-archive is a website aiming to archive linux email lists and to make them easily accessible for linux users/developers.


» Sponsor

» Partners

» Sponsor

Go Back   Linux Archive > Ubuntu > Ubuntu User

 
 
LinkBack Thread Tools
 
Old 03-05-2009, 03:44 PM
Chris Lumens
 
Default Check to see if we're on S390 on the congrats screen (#488747).

This continues the war on calling iutil.isWhatever() everywhere. We can
start using the platform module for that.
---
iw/congrats_gui.py | 3 ++-
textw/complete_text.py | 3 ++-
2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/iw/congrats_gui.py b/iw/congrats_gui.py
index b5f0101..0df2d80 100644
--- a/iw/congrats_gui.py
+++ b/iw/congrats_gui.py
@@ -23,6 +23,7 @@ import gui
from iw_gui import *
from constants import *
import os
+import platform

import gettext
_ = lambda x: gettext.ldgettext("anaconda", x)
@@ -69,7 +70,7 @@ class CongratulationWindow (InstallWindow):
a.set_size_request(200, -1)
hbox.pack_start (a, False, False, 36)

- if iutil.isS390():
+ if isinstance(anaconda.platform, platform.S390):
txt = _("Congratulations, your %s installation is complete.

") % (productName,)

if not anaconda.canReIPL:
diff --git a/textw/complete_text.py b/textw/complete_text.py
index 1793cab..fc4e5c1 100644
--- a/textw/complete_text.py
+++ b/textw/complete_text.py
@@ -22,6 +22,7 @@ from snack import *
from constants_text import *
from constants import *
import gettext
+import platform
_ = lambda x: gettext.ldgettext("anaconda", x)

class FinishedWindow:
@@ -34,7 +35,7 @@ class FinishedWindow:

screen.pushHelpLine (string.center(bottomstr, screen.width))

- if iutil.isS390():
+ if isinstance(anaconda.platform, platform.S390):
txt = _("Congratulations, your %s installation is complete.

") % (productName,)

if not anaconda.canReIPL:
--
1.6.1.3

_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@redhat.com
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
 

Thread Tools




All times are GMT. The time now is 07:45 AM.

VBulletin, Copyright ©2000 - 2014, Jelsoft Enterprises Ltd.
Content Relevant URLs by vBSEO ©2007, Crawlability, Inc.
Copyright 2007 - 2008, www.linux-archive.org