wic: code cleanup: undefined variables

PATCH New Ed Bartosh 1 participant 1 message Apr 15, 2015

lore

Share & tools

lore

Ed Bartosh

author

2015-04-15 20:45 UTC #0 lore raw

PATCH 1/1 wic: code cleanup: undefined variables

Fixed forgoten imports Wic_PartData and ImageError. Removed unused and undefined variable syslinux_conf.

Signed-off-by Ed Bartosh <[email protected]>

---
 scripts/lib/wic/kickstart/custom_commands/__init__.py | 1 +
 scripts/lib/wic/plugins/source/bootimg-efi.py         | 3 +--
 scripts/lib/wic/plugins/source/bootimg-pcbios.py      | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

scripts/lib/wic/kickstart/custom_commands/__init__.py +1 -0

index f84c6d9..b4e613d 100644
@@ -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",

scripts/lib/wic/plugins/source/bootimg-efi.py +1 -2

index d6c11ed..883378e 100644
@@ -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)

scripts/lib/wic/plugins/source/bootimg-pcbios.py +1 -0

index abb32eb..2280867 100644
@@ -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

Signature · 1 line

2.1.4