diff options
| author | Jeremy Katz <katzj@redhat.com> | 2007-03-23 17:27:57 +0000 |
|---|---|---|
| committer | Jeremy Katz <katzj@redhat.com> | 2007-03-23 17:27:57 +0000 |
| commit | a6ccde9a50ead82814740e175e7d5b2b6f94bd69 (patch) | |
| tree | 5f9c454ca322b5e847b57f3a263c7340961ea162 /installclass.py | |
| parent | 9df18d1cca7d1278d01cb37fd34f385d17b51dd8 (diff) | |
| download | anaconda-a6ccde9a50ead82814740e175e7d5b2b6f94bd69.tar.gz anaconda-a6ccde9a50ead82814740e175e7d5b2b6f94bd69.tar.xz anaconda-a6ccde9a50ead82814740e175e7d5b2b6f94bd69.zip | |
2007-03-23 Jeremy Katz <katzj@redhat.com>
* anaconda (getInstClass): Don't duplicate code (Elliot Peele)
* installclass.py (getBaseInstallClass): Likewise.
Diffstat (limited to 'installclass.py')
| -rw-r--r-- | installclass.py | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/installclass.py b/installclass.py index 32ab57486..75c4ae0a9 100644 --- a/installclass.py +++ b/installclass.py @@ -566,15 +566,24 @@ def getBaseInstallClass(): if len(avail) == 1: (cname, cobject, clogo) = avail[0] log.info("using only installclass %s" %(cname,)) - return cobject elif len(allavail) == 1: (cname, cobject, clogo) = allavail[0] log.info("using only installclass %s" %(cname,)) - return cobject + + # Use the highest priority install class if more than one found. + elif len(avail) > 1: + (cname, cobject, clogo) = avail.pop() + log.info('%s is the highest priority installclass, using it' % cname) + elif len(allavail) > 1: + (cname, cobject, clogo) = allavail.pop() + log.info('%s is the highest priority installclass, using it' % cname) + + # Default to the base installclass if nothing else is found. else: cobject = BaseInstallClass log.info("using baseinstallclass as base") - return BaseInstallClass + + return cobject baseclass = getBaseInstallClass() |