[oe-commits] Darren Hart : wic: Check for external modules

git at git.openembedded.org git at git.openembedded.org
Wed Oct 16 12:18:43 UTC 2013


Module: openembedded-core.git
Branch: master
Commit: b11bfadba20c1f39a63e396e605a8316c2ed2a94
URL:    http://git.openembedded.org/?p=openembedded-core.git&a=commit;h=b11bfadba20c1f39a63e396e605a8316c2ed2a94

Author: Darren Hart <dvhart at linux.intel.com>
Date:   Tue Oct 15 14:46:24 2013 -0700

wic: Check for external modules

Since eight unique files import rpm, perform a check at the top level
for the existence of the rpm module print a sensible error message if it
is not. This may be able to be removed if some of the core rpm
dependencies are removed from the mic libs.

Also check for urlgrabber.

This avoids a bracktrace in the event the modules are not installed
which can be very off-putting to would-be users.

Signed-off-by: Darren Hart <dvhart at linux.intel.com>
Cc: Tom Zanussi <tom.zanussi at intel.com>
Signed-off-by: Richard Purdie <richard.purdie at linuxfoundation.org>

---

 scripts/wic |   12 ++++++++++++
 1 files changed, 12 insertions(+), 0 deletions(-)

diff --git a/scripts/wic b/scripts/wic
index 425b665..a7221c3 100755
--- a/scripts/wic
+++ b/scripts/wic
@@ -31,11 +31,23 @@
 
 __version__ = "0.1.0"
 
+# Python Standard Library modules
 import os
 import sys
 import optparse
 import logging
 
+# External modules
+try:
+    import rpm
+    import urlgrabber
+except ImportError:
+    print("ERROR: failed to import necessary modules.")
+    print("Please ensure the following modules are installed:")
+    print("\trpm");
+    print("\turlgrabber");
+    sys.exit(1)
+
 scripts_path = os.path.abspath(os.path.dirname(os.path.abspath(sys.argv[0])))
 lib_path = scripts_path + '/lib'
 sys.path = sys.path + [lib_path]



More information about the Openembedded-commits mailing list