diff options
author | Tom Zanussi <tom.zanussi@linux.intel.com> | 2014-08-08 15:11:31 -0500 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2014-08-11 10:53:12 +0100 |
commit | ff1aa2358eb31f21c3acdb980633f5bbc77bda77 (patch) | |
tree | 45c56fac452e19b46d51d445e886183f97f0e8c0 /scripts/lib/mic/utils | |
parent | 312479cf075fc614afb9588412c03d716c850ab6 (diff) | |
download | ast2050-yocto-poky-ff1aa2358eb31f21c3acdb980633f5bbc77bda77.zip ast2050-yocto-poky-ff1aa2358eb31f21c3acdb980633f5bbc77bda77.tar.gz |
wic: Rename MountError
wic doesn't mount anything, so can't have a mount error; rename it to
something more appropriate.
(From OE-Core rev: e1edee656fc9c0a791c0eb62796d1afa483be34e)
Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'scripts/lib/mic/utils')
-rw-r--r-- | scripts/lib/mic/utils/errors.py | 5 | ||||
-rw-r--r-- | scripts/lib/mic/utils/partitionedfs.py | 8 |
2 files changed, 5 insertions, 8 deletions
diff --git a/scripts/lib/mic/utils/errors.py b/scripts/lib/mic/utils/errors.py index 38fda30..86e230a 100644 --- a/scripts/lib/mic/utils/errors.py +++ b/scripts/lib/mic/utils/errors.py @@ -40,11 +40,8 @@ class Usage(CreatorError): self.msg = str(self.msg) return self.keyword + self.msg + ', please use "--help" for more info' -class Abort(CreatorError): - keyword = '' - class KsError(CreatorError): keyword = '<kickstart>' -class MountError(CreatorError): +class ImageError(CreatorError): keyword = '<mount>' diff --git a/scripts/lib/mic/utils/partitionedfs.py b/scripts/lib/mic/utils/partitionedfs.py index f4ce4a9..68e4cab 100644 --- a/scripts/lib/mic/utils/partitionedfs.py +++ b/scripts/lib/mic/utils/partitionedfs.py @@ -22,7 +22,7 @@ import os from mic import msger from mic.utils import runner -from mic.utils.errors import MountError +from mic.utils.errors import ImageError from mic.utils.fs_related import * from mic.utils.oe.misc import * @@ -121,7 +121,7 @@ class Image: msger.debug("Assigning %s partitions to disks" % ptable_format) if ptable_format not in ('msdos'): - raise MountError("Unknown partition table format '%s', supported " \ + raise ImageError("Unknown partition table format '%s', supported " \ "formats are: 'msdos'" % ptable_format) if self._partitions_layed_out: @@ -134,14 +134,14 @@ class Image: p = self.partitions[n] if not self.disks.has_key(p['disk_name']): - raise MountError("No disk %s for partition %s" \ + raise ImageError("No disk %s for partition %s" \ % (p['disk_name'], p['mountpoint'])) if p['part_type']: # The --part-type can also be implemented for MBR partitions, # in which case it would map to the 1-byte "partition type" # filed at offset 3 of the partition entry. - raise MountError("setting custom partition type is not " \ + raise ImageError("setting custom partition type is not " \ "implemented for msdos partitions") # Get the disk where the partition is located |