diff options
| author | Steffen Maier <maier@linux.vnet.ibm.com> | 2009-07-10 10:19:40 -1000 |
|---|---|---|
| committer | David Cantrell <dcantrell@redhat.com> | 2009-07-10 13:50:16 -1000 |
| commit | f13f934cc9a8898b996731fbb950048ba3fbbc6d (patch) | |
| tree | 877a6c338b58e9feaccfba4b432cf3bd32f78b98 | |
| parent | 7ba27add65625961717a473f6a5c01bb7baf00d6 (diff) | |
| download | anaconda-f13f934cc9a8898b996731fbb950048ba3fbbc6d.tar.gz anaconda-f13f934cc9a8898b996731fbb950048ba3fbbc6d.tar.xz anaconda-f13f934cc9a8898b996731fbb950048ba3fbbc6d.zip | |
error messages of zFCP on s390: log or pass to the UI
| -rw-r--r-- | kickstart.py | 5 | ||||
| -rw-r--r-- | storage/zfcp.py | 12 | ||||
| -rw-r--r-- | textw/partition_text.py | 5 |
3 files changed, 17 insertions, 5 deletions
diff --git a/kickstart.py b/kickstart.py index a53dac90e..bf61333be 100644 --- a/kickstart.py +++ b/kickstart.py @@ -966,7 +966,10 @@ class ZFCP(commands.zfcp.FC3_ZFCP): def parse(self, args): retval = commands.zfcp.FC3_ZFCP.parse(self, args) for fcp in self.zfcp: - self.handler.id.zfcp.addFCP(fcp.devnum, fcp.wwpn, fcp.fcplun) + try: + self.handler.id.zfcp.addFCP(fcp.devnum, fcp.wwpn, fcp.fcplun) + except ValueError, e: + log.warning(str(e)) isys.flushDriveDict() return retval diff --git a/storage/zfcp.py b/storage/zfcp.py index 7bb31b916..b948eb530 100644 --- a/storage/zfcp.py +++ b/storage/zfcp.py @@ -225,7 +225,7 @@ class ZFCP: try: self.addFCP(devnum, wwpn, fcplun) except ValueError, e: - log.warn("Invalid FCP device configuration: %s" %(e,)) + log.warn(str(e)) continue def addFCP(self, devnum, wwpn, fcplun): @@ -237,7 +237,10 @@ class ZFCP: if len(self.fcpdevs) == 0: return for d in self.fcpdevs: - d.offlineDevice() + try: + d.offlineDevice() + except ValueError, e: + log.warn(str(e)) def startup(self): if not self.hasReadConfig: @@ -247,7 +250,10 @@ class ZFCP: if len(self.fcpdevs) == 0: return for d in self.fcpdevs: - d.onlineDevice() + try: + d.onlineDevice() + except ValueError, e: + log.warn(str(e)) def writeKS(self, f): if len(self.fcpdevs) == 0: diff --git a/textw/partition_text.py b/textw/partition_text.py index f14a273d6..412a7d75e 100644 --- a/textw/partition_text.py +++ b/textw/partition_text.py @@ -211,7 +211,10 @@ class PartitionTypeWindow: devnum = entries[0].strip() wwpn = entries[1].strip() fcplun = entries[2].strip() - self.anaconda.id.storage.zfcp.addFCP(devnum, wwpn, fcplun) + try: + self.anaconda.id.storage.zfcp.addFCP(devnum, wwpn, fcplun) + except ValueError, e: + log.warn(str(e)) # alternatively popup error dialog instead return INSTALL_OK |