From 2d59b6eeb418cf23eef3e32b43354b4ab16a40b9 Mon Sep 17 00:00:00 2001 From: Tom Zanussi Date: Tue, 22 Oct 2013 09:23:58 -0500 Subject: wic: Remove dependency on rpmmisc rpmmisc imports rpm and contains misc rpm utilities related to packaging and determining arches based on the packaging. We should never run across this in the initial version of wic, so remove the dependency. Signed-off-by: Tom Zanussi Signed-off-by: Richard Purdie --- scripts/lib/mic/creator.py | 2 +- scripts/lib/mic/imager/livecd.py | 2 +- scripts/lib/mic/utils/misc.py | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/scripts/lib/mic/creator.py b/scripts/lib/mic/creator.py index b36bbf064a..267928f877 100644 --- a/scripts/lib/mic/creator.py +++ b/scripts/lib/mic/creator.py @@ -19,7 +19,7 @@ import os, sys, re from optparse import SUPPRESS_HELP from mic import msger -from mic.utils import cmdln, errors, rpmmisc +from mic.utils import cmdln, errors from mic.conf import configmgr from mic.plugin import pluginmgr diff --git a/scripts/lib/mic/imager/livecd.py b/scripts/lib/mic/imager/livecd.py index a992ee0706..07115526bd 100644 --- a/scripts/lib/mic/imager/livecd.py +++ b/scripts/lib/mic/imager/livecd.py @@ -20,7 +20,7 @@ import glob import shutil from mic import kickstart, msger -from mic.utils import fs_related, rpmmisc, runner, misc +from mic.utils import fs_related, runner, misc from mic.utils.errors import CreatorError from mic.imager.loop import LoopImageCreator diff --git a/scripts/lib/mic/utils/misc.py b/scripts/lib/mic/utils/misc.py index 67ddef2e44..2c4a3ac307 100644 --- a/scripts/lib/mic/utils/misc.py +++ b/scripts/lib/mic/utils/misc.py @@ -45,7 +45,6 @@ from mic.utils.fs_related import find_binary_path, makedirs from mic.utils.grabber import myurlgrab from mic.utils.proxy import get_proxy_for from mic.utils import runner -from mic.utils import rpmmisc RPM_RE = re.compile("(.*)\.(.*) (.*)-(.*)") -- cgit 1.2.3-korg