Patchwork [07/10] wic: Remove rpmmisc call from livecd

login
register
mail settings
Submitter tom.zanussi@linux.intel.com
Date Oct. 22, 2013, 2:24 p.m.
Message ID <8ea5aee83fd0a582e85f2450d27b7d22a6616680.1382451106.git.tom.zanussi@linux.intel.com>
Download mbox | patch
Permalink /patch/60373/
State Accepted
Commit 51fdae503a07f3874baca7482a08353915c65cb0
Headers show

Comments

tom.zanussi@linux.intel.com - Oct. 22, 2013, 2:24 p.m.
We don't currently use LiveCDImageCreator, but it makes calls when
initialized via the plugin interface to rpmmisc module functions,
which we don't want the dependency on.

To make it (and LiveUSBImageCreator) happy, we give it the dummy
"i386" value for now.

Signed-off-by: Tom Zanussi <tom.zanussi@linux.intel.com>
---
 scripts/lib/mic/imager/livecd.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Patch

diff --git a/scripts/lib/mic/imager/livecd.py b/scripts/lib/mic/imager/livecd.py
index 0711552..e36f4a7 100644
--- a/scripts/lib/mic/imager/livecd.py
+++ b/scripts/lib/mic/imager/livecd.py
@@ -741,7 +741,7 @@  hiddenmenu
         self._configure_syslinux_bootloader(isodir)
         self._configure_efi_bootloader(isodir)
 
-arch = rpmmisc.getBaseArch()
+arch = "i386"
 if arch in ("i386", "x86_64"):
     LiveCDImageCreator = x86LiveImageCreator
 elif arch.startswith("arm"):