[PATCH 2/2] Deal with a couple more "except Exception" lines.
Chris Lumens
clumens at redhat.com
Mon Feb 17 16:30:46 UTC 2014
Most I got rid of because they were unnecessary, but one I've left but disabled
the warning on because we really don't want anaconda-yum to crash ever.
---
pyanaconda/kickstart.py | 9 +++++----
scripts/anaconda-yum | 3 ++-
2 files changed, 7 insertions(+), 5 deletions(-)
diff --git a/pyanaconda/kickstart.py b/pyanaconda/kickstart.py
index 7a2206c..a613f78 100644
--- a/pyanaconda/kickstart.py
+++ b/pyanaconda/kickstart.py
@@ -23,6 +23,7 @@ from blivet.deviceaction import ActionCreateFormat, ActionDestroyFormat, ActionR
from blivet.devices import LUKSDevice
from blivet.devicelibs.lvm import getPossiblePhysicalExtents
from blivet.devicelibs import swap
+from blivet.errors import SizeParamsError
from blivet.formats import getFormat
from blivet.partitioning import doPartitioning
from blivet.partitioning import growLVM
@@ -702,7 +703,7 @@ class LogVolData(commands.logvol.F20_LogVolData):
try:
size = Size(spec="%d MiB" % self.size)
- except Exception:
+ except (ValueError, SizeParamsError):
raise KickstartValueError(formatErrorMsg(self.lineno, msg="The size %s is not valid." % self.size))
if self.mountpoint == "swap":
@@ -844,7 +845,7 @@ class LogVolData(commands.logvol.F20_LogVolData):
if self.maxSizeMB:
try:
maxsize = Size(spec="%d MiB" % self.maxSizeMB)
- except Exception:
+ except (ValueError, SizeParamsError):
raise KickstartValueError(formatErrorMsg(self.lineno, msg="The maximum size %s is not valid." % self.maxSizeMB))
else:
maxsize = None
@@ -934,7 +935,7 @@ class PartitionData(commands.partition.F18_PartData):
try:
size = Size(spec="%d MiB" % self.size)
- except Exception:
+ except (ValueError, SizeParamsError):
raise KickstartValueError(formatErrorMsg(self.lineno, msg="The size %s is not valid." % self.size))
if self.onbiosdisk != "":
@@ -1091,7 +1092,7 @@ class PartitionData(commands.partition.F18_PartData):
if self.maxSizeMB:
try:
maxsize = Size(spec="%d MiB" % self.maxSizeMB)
- except Exception:
+ except (ValueError, SizeParamsError):
raise KickstartValueError(formatErrorMsg(self.lineno, msg="The maximum size %s is not valid." % self.maxSizeMB))
else:
maxsize = None
diff --git a/scripts/anaconda-yum b/scripts/anaconda-yum
index 95ae58d..d8faab1 100755
--- a/scripts/anaconda-yum
+++ b/scripts/anaconda-yum
@@ -156,6 +156,7 @@ def run_yum_transaction(release, arch, yum_conf, install_root, ts_file, script_l
logfile.close()
except YumBaseError as e:
print("ERROR: transaction error: %s" % e)
+ # pylint: disable-msg=W0703
except Exception as e:
print("ERROR: unexpected error: %s" % e)
finally:
@@ -254,7 +255,7 @@ class RPMCallback(object):
try:
repo = self.yb.repos.getRepo(txmbr.po.repoid)
- except Exception as e:
+ except yum.Errors.RepoError as e:
print("ERROR: getRepo failed: %s" % e)
raise Exception("rpmcallback getRepo failed")
--
1.8.3.1
More information about the anaconda-patches
mailing list