Patchwork [03/10] wic: Remove dependency on rpmmisc

login
register
mail settings
Submitter tom.zanussi@linux.intel.com
Date Oct. 22, 2013, 2:23 p.m.
Message ID <584c7c6b384feea4937b183f03075c95e615cb41.1382451106.git.tom.zanussi@linux.intel.com>
Download mbox | patch
Permalink /patch/60369/
State Accepted
Commit c4a4fc524cde719b3afd21d216695142d55fac67
Headers show

Comments

tom.zanussi@linux.intel.com - Oct. 22, 2013, 2:23 p.m.
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 <tom.zanussi@linux.intel.com>
---
 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(-)

Patch

diff --git a/scripts/lib/mic/creator.py b/scripts/lib/mic/creator.py
index b36bbf0..267928f 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 a992ee0..0711552 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 67ddef2..2c4a3ac 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("(.*)\.(.*) (.*)-(.*)")