From: Hans-Christoph Steiner <hans@eds.org>
Date: Fri, 2 May 2014 02:46:51 +0000 (-0400)
Subject: fix "fdroidserver/build.py:41: redefinition of unused 'paramiko' from line 39"
X-Git-Tag: 0.2~89^2~17
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d564c37c35b4b3bc77d56ffbb7a63518ca7d5132;p=fdroidserver.git

fix "fdroidserver/build.py:41: redefinition of unused 'paramiko' from line 39"

pyflakes gave this error based on the `paramiko = None` statement. I used
a different way to test whether paramiko was successfully imported that is
directly based on the relevant Exceptions.
---

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index ccb84605..d062cc9e 100644
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -37,8 +37,8 @@ from common import BuildException, VCSException, FDroidPopen, SilentPopen
 
 try:
     import paramiko
-except:
-    paramiko = None
+except ImportError:
+    pass
 
 def get_builder_vm_id():
     vd = os.path.join('builder', '.vagrant')
@@ -244,7 +244,9 @@ def release_vm():
 def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
     """Do a build on the build server."""
 
-    if not paramiko:
+    try:
+        paramiko
+    except NameError:
         raise BuildException("Paramiko is required to use the buildserver")
     if options.verbose:
         logging.getLogger("paramiko").setLevel(logging.DEBUG)