[PATCH 2/6] A couple updates to installclasses.

Radek Vykydal rvykydal at redhat.com
Mon Jun 1 15:47:40 UTC 2015


From: Chris Lumens <clumens at redhat.com>

Related: rhbz#1155452

Port of commit e8952489ce4c130612d6d06f3bc20155eb5fc102 from master.

* hidden and showHidden should be booleans, not ints in disguise.
* Get rid of default and id.  These are unused.
* Stop marking names for translation and remove mnemonics.  These haven't been
  used since the days of workstation/server/custom selection in the UI.  Does
  anyone else even still remember this?

atomic-rhel-7.1 dist-git patch
0029-A-couple-updates-to-installclasses.patch
---
 po/POTFILES.in                      |  4 ----
 pyanaconda/installclass.py          | 15 ++++++---------
 pyanaconda/installclasses/fedora.py |  7 ++-----
 pyanaconda/installclasses/rhel.py   |  7 ++-----
 4 files changed, 10 insertions(+), 23 deletions(-)

diff --git a/po/POTFILES.in b/po/POTFILES.in
index 8991aa5..42472fb 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -23,10 +23,6 @@ pyanaconda/text.py
 pyanaconda/users.py
 pyanaconda/vnc.py
 
-# Install class definitions
-pyanaconda/installclasses/fedora.py
-pyanaconda/installclasses/rhel.py
-
 # Packaging module source files
 pyanaconda/packaging/__init__.py
 pyanaconda/packaging/livepayload.py
diff --git a/pyanaconda/installclass.py b/pyanaconda/installclass.py
index d6d0a8a..c9d741a 100644
--- a/pyanaconda/installclass.py
+++ b/pyanaconda/installclass.py
@@ -37,7 +37,7 @@ from pyanaconda.kickstart import getAvailableDiskSpace
 
 class BaseInstallClass(object):
     # default to not being hidden
-    hidden = 0
+    hidden = False
     name = "base"
     bootloaderTimeoutDefault = None
     bootloaderExtraArgs = []
@@ -58,9 +58,6 @@ class BaseInstallClass(object):
     # Blivet uses by default.
     defaultFS = None
 
-    # don't select this class by default
-    default = 0
-
     # help
     help_folder = "/usr/share/anaconda/help"
     help_main_page = "Installation_Guide.xml"
@@ -128,8 +125,8 @@ class BaseInstallClass(object):
 allClasses = []
 allClasses_hidden = []
 
-# returns ( className, classObject, classLogo ) tuples
-def availableClasses(showHidden=0):
+# returns ( className, classObject ) tuples
+def availableClasses(showHidden=False):
     global allClasses
     global allClasses_hidden
 
@@ -204,7 +201,7 @@ def availableClasses(showHidden=0):
                 # If it's got these two methods, it's an InstallClass.
                 if hasattr(obj, "setDefaultPartitioning") and hasattr(obj, "setPackageSelection"):
                     sortOrder = getattr(obj, "sortPriority", 0)
-                    if obj.hidden == 0 or showHidden == 1:
+                    if not obj.hidden or showHidden:
                         lst.append(((obj.name, obj), sortOrder))
         except (ImportError, AttributeError):
             log.warning ("module import of %s failed: %s", mainName, sys.exc_type)
@@ -223,8 +220,8 @@ def availableClasses(showHidden=0):
 
 def getBaseInstallClass():
     # figure out what installclass we should base on.
-    allavail = availableClasses(showHidden = 1)
-    avail = availableClasses(showHidden = 0)
+    allavail = availableClasses(showHidden=True)
+    avail = availableClasses(showHidden=False)
 
     if len(avail) == 1:
         (cname, cobject) = avail[0]
diff --git a/pyanaconda/installclasses/fedora.py b/pyanaconda/installclasses/fedora.py
index 9af3d15..d176582 100644
--- a/pyanaconda/installclasses/fedora.py
+++ b/pyanaconda/installclasses/fedora.py
@@ -21,15 +21,12 @@ from pyanaconda.installclass import BaseInstallClass
 from pyanaconda.product import productName
 from pyanaconda import network
 from pyanaconda import nm
-from pyanaconda.i18n import N_
 
 class FedoraBaseInstallClass(BaseInstallClass):
-    # name has underscore used for mnemonics, strip if you dont need it
-    id = "fedora"
-    name = N_("_Fedora")
+    name = "Fedora"
     sortPriority = 10000
     if productName.startswith("Red Hat "):
-        hidden = 1
+        hidden = True
 
     _l10n_domain = "anaconda"
 
diff --git a/pyanaconda/installclasses/rhel.py b/pyanaconda/installclasses/rhel.py
index 4e8dde2..bc7aa0c 100644
--- a/pyanaconda/installclasses/rhel.py
+++ b/pyanaconda/installclasses/rhel.py
@@ -17,19 +17,16 @@
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #
 
-from pyanaconda.i18n import N_
 from pyanaconda.installclass import BaseInstallClass
 from pyanaconda.product import productName
 from pyanaconda import network
 from pyanaconda import nm
 
 class RHELBaseInstallClass(BaseInstallClass):
-    # name has underscore used for mnemonics, strip if you dont need it
-    id = "rhel"
-    name = N_("Red Hat Enterprise Linux")
+    name = "Red Hat Enterprise Linux"
     sortPriority = 10000
     if not productName.startswith(("Red Hat ", "RHEL Atomic")):
-        hidden = 1
+        hidden = True
     defaultFS = "xfs"
 
     bootloaderTimeoutDefault = 5
-- 
1.9.3



More information about the anaconda-patches mailing list