From d564c37c35b4b3bc77d56ffbb7a63518ca7d5132 Mon Sep 17 00:00:00 2001 From: Hans-Christoph Steiner Date: Thu, 1 May 2014 22:46:51 -0400 Subject: [PATCH] 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. --- fdroidserver/build.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) 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) -- 2.30.2