diff options
| author |   Ed Bartosh <ed.bartosh@linux.intel.com> | 2015-04-15 23:45:46 +0300 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2015-04-24 11:05:57 +0100 |
| commit | db0903ad89dcb655c0eec5ac6dce96aae26533da (patch) | |
| tree | cccc97801d0ef1f9966d454caaf0d4f29046a947 | |
| parent | 617225af7a7cc9cb038fb1e6466af03867482032 (diff) | |
| download | openembedded-core-contrib-db0903ad89dcb655c0eec5ac6dce96aae26533da.tar.gz | |
wic: code cleanup: undefined variables
Fixed forgoten imports Wic_PartData and ImageError.
Removed unused and undefined variable syslinux_conf.
Signed-off-by: Ed Bartosh <ed.bartosh@linux.intel.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
| -rw-r--r-- | scripts/lib/wic/kickstart/custom_commands/__init__.py | 1 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-efi.py | 3 | ||||
| -rw-r--r-- | scripts/lib/wic/plugins/source/bootimg-pcbios.py | 1 |
3 files changed, 3 insertions, 2 deletions
diff --git a/scripts/lib/wic/kickstart/custom_commands/__init__.py b/scripts/lib/wic/kickstart/custom_commands/__init__.py index f84c6d9e00..b4e613de4c 100644 --- a/scripts/lib/wic/kickstart/custom_commands/__init__.py +++ b/scripts/lib/wic/kickstart/custom_commands/__init__.py @@ -1,6 +1,7 @@ from micpartition import Mic_Partition from micpartition import Mic_PartData from partition import Wic_Partition +from partition import Wic_PartData __all__ = ( "Mic_Partition", diff --git a/scripts/lib/wic/plugins/source/bootimg-efi.py b/scripts/lib/wic/plugins/source/bootimg-efi.py index d6c11ed428..883378ee84 100644 --- a/scripts/lib/wic/plugins/source/bootimg-efi.py +++ b/scripts/lib/wic/plugins/source/bootimg-efi.py @@ -27,6 +27,7 @@ import os import shutil +from wic.utils.errors import ImageError from wic import kickstart, msger from wic.utils import misc, fs_related, errors, runner, cmdln from wic.conf import configmgr @@ -72,8 +73,6 @@ class BootimgEFIPlugin(SourcePlugin): grubefi_conf += "linux %s root=%s rootwait %s\n" \ % (kernel, rootstr, options) grubefi_conf += "}\n" - if splashline: - syslinux_conf += "%s\n" % splashline msger.debug("Writing grubefi config %s/hdd/boot/EFI/BOOT/grub.cfg" \ % cr_workdir) diff --git a/scripts/lib/wic/plugins/source/bootimg-pcbios.py b/scripts/lib/wic/plugins/source/bootimg-pcbios.py index abb32ebc10..2280867308 100644 --- a/scripts/lib/wic/plugins/source/bootimg-pcbios.py +++ b/scripts/lib/wic/plugins/source/bootimg-pcbios.py @@ -26,6 +26,7 @@ import os +from wic.utils.errors import ImageError from wic import kickstart, msger from wic.utils import misc, fs_related, errors, runner, cmdln from wic.conf import configmgr |