Bring syntax up to date in the rhel installclass.
---
installclasses/rhel.py | 14 ++++++++------
1 files changed, 8 insertions(+), 6 deletions(-)
diff --git a/installclasses/rhel.py b/installclasses/rhel.py
index 0cb291f..906189d 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
--
1.6.2.5
_______________________________________________
Anaconda-devel-list mailing list
Anaconda-devel-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/anaconda-devel-list
