[SCM] morituri/master: handle the case where we couldn't even import deps.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 1e9886d42231188f3fb86b62ca3b2d87882c8751
Author: Thomas Vander Stichele <thomas (at) apestaart (dot) org>
Date:   Sat Aug 24 00:33:57 2013 +0200

    handle the case where we couldn't even import deps.
    
    Fixes ticket 147 on trac.

diff --git a/bin/rip.in b/bin/rip.in
index ac38958..6f7cccf 100755
--- a/bin/rip.in
+++ b/bin/rip.in
@@ -30,6 +30,8 @@ and assure it doesn't raise an exception.
     sys.exit(1)
 
 # now load the main function
+h = None
+
 try:
     from morituri.common import deps
     from morituri.extern.deps import deps as edeps
@@ -38,6 +40,9 @@ try:
     from morituri.rip import main
     sys.exit(main.main(sys.argv[1:]))
 except ImportError, e:
+    if not h:
+        # we couldn't even import deps, so reraise
+        raise
     h.handleImportError(e)
     sys.exit(1)
 except edeps.DependencyError:

-- 
morituri packaging