summaryrefslogtreecommitdiffstats
path: root/installclasses
diff options
context:
space:
mode:
authorDavid Cantrell <dcantrell@redhat.com>2009-09-21 17:16:45 -1000
committerDavid Cantrell <dcantrell@redhat.com>2009-09-21 17:19:45 -1000
commit2c8f95f84064ff81ed6b7ac7f7a0e8648e5355cd (patch)
tree8f65b68c3b36ef5acd0e7b41fa488d0e38046d1a /installclasses
parenta7c45f4b2ca25407d8a959f05986cd6481dd905b (diff)
downloadanaconda-2c8f95f84064ff81ed6b7ac7f7a0e8648e5355cd.tar.gz
anaconda-2c8f95f84064ff81ed6b7ac7f7a0e8648e5355cd.tar.xz
anaconda-2c8f95f84064ff81ed6b7ac7f7a0e8648e5355cd.zip
Fixes for rhel installclass.
Bring syntax up to date in the rhel installclass.
Diffstat (limited to 'installclasses')
-rw-r--r--installclasses/rhel.py14
1 files changed, 8 insertions, 6 deletions
diff --git a/installclasses/rhel.py b/installclasses/rhel.py
index 0cb291fb9..906189dc8 100644
--- a/installclasses/rhel.py
+++ b/installclasses/rhel.py
@@ -84,16 +84,15 @@ class InstallClass(BaseInstallClass):
product.productVersion, product.productName)
def setInstallData(self, anaconda):
- BaseInstallClass.setInstallData(self, anaconda)
- BaseInstallClass.setDefaultPartitioning(self,
+ BaseInstallClass.setInstallData(self, anaconda)
+ BaseInstallClass.setDefaultPartitioning(self,
anaconda.id.storage,
anaconda.platform)
def setSteps(self, anaconda):
- dispatch = anaconda.dispatch
- BaseInstallClass.setSteps(self, dispatch);
- dispatch.skipStep("partition")
- dispatch.skipStep("regkey", skip = 0)
+ BaseInstallClass.setSteps(self, anaconda)
+ anaconda.dispatch.skipStep("partition")
+ anaconda.dispatch.skipStep("regkey", skip = 0)
# for rhel, we're putting the metadata under productpath
def getPackagePaths(self, uri):
@@ -176,6 +175,9 @@ class InstallClass(BaseInstallClass):
return yuminstall.YumBackend
def productMatches(self, oldprod):
+ if oldprod is None:
+ return False
+
if oldprod.startswith(productName):
return True