diff options
| author | Chris Lumens <clumens@redhat.com> | 2012-05-08 14:13:37 -0400 |
|---|---|---|
| committer | Chris Lumens <clumens@redhat.com> | 2012-05-08 14:13:37 -0400 |
| commit | c0485cbbe870cb24adf037b3cdbcac1fd3d57586 (patch) | |
| tree | 0c664af51bcbd2fd386a86668df7ffcb620782b6 /pyanaconda/image.py | |
| parent | ab844aab8c774bc5d8b6b804c21a8673bd4d2400 (diff) | |
| download | anaconda-c0485cbbe870cb24adf037b3cdbcac1fd3d57586.tar.gz anaconda-c0485cbbe870cb24adf037b3cdbcac1fd3d57586.tar.xz anaconda-c0485cbbe870cb24adf037b3cdbcac1fd3d57586.zip | |
errorHandler -> errorHandler.cb.
Diffstat (limited to 'pyanaconda/image.py')
| -rw-r--r-- | pyanaconda/image.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/pyanaconda/image.py b/pyanaconda/image.py index 8c7597b03..4af797330 100644 --- a/pyanaconda/image.py +++ b/pyanaconda/image.py @@ -88,7 +88,7 @@ def findFirstIsoImage(path): if os.stat(what)[stat.ST_SIZE] % 2048: log.warning("%s appears to be corrupted" % what) exn = InvalidImageSizeError("size is not a multiple of 2048 bytes") - if errorHandler(exn) == ERROR_RAISE: + if errorHandler.cb(exn) == ERROR_RAISE: raise exn log.info("Found disc at %s" % fn) @@ -130,7 +130,7 @@ def mountImageDirectory(method, storage): except StorageError as e: log.error("couldn't mount ISO source directory: %s" % e) exn = MediaMountError(str(e)) - if errorHandler(exn) == ERROR_RAISE: + if errorHandler.cb(exn) == ERROR_RAISE: raise exn elif methodstr.startswith("nfsiso:"): # XXX what if we mount it on ISO_DIR and then create a symlink @@ -149,7 +149,7 @@ def mountImageDirectory(method, storage): except SystemError as e: log.error("couldn't mount ISO source directory: %s" % e) exn = MediaMountError(str(e)) - if errorHandler(exn) == ERROR_RAISE: + if errorHandler.cb(exn) == ERROR_RAISE: raise exn def mountImage(isodir, tree, messageWindow): @@ -157,7 +157,7 @@ def mountImage(isodir, tree, messageWindow): image = findFirstIsoImage(isodir, messageWindow) if image is None: exn = MissingImageError() - if errorHandler(exn) == ERROR_RAISE: + if errorHandler.cb(exn) == ERROR_RAISE: raise exn else: continue @@ -167,7 +167,7 @@ def mountImage(isodir, tree, messageWindow): isys.mount(image, tree, fstype = 'iso9660', readOnly = True) except SystemError: exn = MissingImageError() - if errorHandler(exn) == ERROR_RAISE: + if errorHandler.cb(exn) == ERROR_RAISE: raise exn else: continue @@ -214,7 +214,7 @@ def unmountCD(dev): except Exception as e: log.error("exception in _unmountCD: %s" %(e,)) exn = MediaUnmountError() - errorHandler(exn, dev) + errorHandler.cb(exn, dev) else: break |