diff options
| -rw-r--r-- | autopart.py | 4 | ||||
| -rw-r--r-- | partedUtils.py | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/autopart.py b/autopart.py index e6d3c0db9..829bc787b 100644 --- a/autopart.py +++ b/autopart.py @@ -271,7 +271,7 @@ def fitConstrained(diskset, requests, primOnly=0, newParts = None): try: disk.add_partition (newp, constraint) - except parted.error, msg: + except Exception, msg: raise PartitioningError, str(msg) for flag in request.fstype.getPartedPartitionFlags(): if not newp.is_flag_available(flag): @@ -474,7 +474,7 @@ def fitSized(diskset, requests, primOnly = 0, newParts = None): try: disk.add_partition (newp, constraint) - except parted.error, msg: + except Exception, msg: raise PartitioningError, str(msg) for flag in request.fstype.getPartedPartitionFlags(): if not newp.is_flag_available(flag): diff --git a/partedUtils.py b/partedUtils.py index b7c6b14f9..9419eea65 100644 --- a/partedUtils.py +++ b/partedUtils.py @@ -960,7 +960,7 @@ class DiskSet: disk = parted.Disk(device=dev) else: disk = labelDisk(deviceFile) - except parted.error, msg: + except Exception, msg: log.error("parted error: %s" % (msg,)) raise except: @@ -1047,7 +1047,7 @@ class DiskSet: if not dev: dev = parted.getDevice("/dev/%s" % (drive,)) disk = None - except parted.error, msg: + except Exception, msg: log.debug("parted error: %s" % (msg,)) self._removeDisk(drive, disk) continue @@ -1056,7 +1056,7 @@ class DiskSet: if not disk: disk = parted.Disk(device=dev) self._addDisk(drive, disk) - except parted.error, msg: + except Exception, msg: recreate = 0 if zeroMbr: log.error("zeroMBR was set and invalid partition table " |