From 02c7c47ece50d7d24ebc6d7fd1c66fae11b05243 Mon Sep 17 00:00:00 2001 From: Benjamin Drung Date: Sat, 12 Feb 2011 22:37:16 +0100 Subject: [PATCH] suspicious-source: Show error message instead of having the import error for recommended packages (Closes: #613101, LP: #693813). --- debian/changelog | 7 +++++++ suspicious-source | 7 ++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 66cab51..179e8a8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +ubuntu-dev-tools (0.117) UNRELEASED; urgency=low + + * suspicious-source: Show error message instead of having the import error + for recommended packages (Closes: #613101, LP: #693813). + + -- Benjamin Drung Sat, 12 Feb 2011 22:35:07 +0100 + ubuntu-dev-tools (0.116) unstable; urgency=low [ Benjamin Drung ] diff --git a/suspicious-source b/suspicious-source index 863bd90..2e7a549 100755 --- a/suspicious-source +++ b/suspicious-source @@ -14,13 +14,18 @@ # ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF # OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -import magic import optparse import os import sys from ubuntutools.logger import Logger +try: + import magic +except ImportError: + Logger.error("Please install 'python-magic' in order to use this utility.") + sys.exit(1) + DEFAULT_WHITELISTED_MIMETYPES = [ "application/vnd.font-fontforge-sfd", # font source: fontforge "application/x-elc",