From e3628b2d740e0ccd3ba8a4ed82fd7b2b6b5519bf Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 20 Jan 2015 18:01:29 +0100
Subject: [PATCH 1/3] fix PEP8 E124 closing bracket missing visual indentation

---
 fdroidserver/common.py | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index c256fb18..05f73653 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -1537,8 +1537,7 @@ def scan_source(build_dir, root_dir, thisbuild):
                     'application/zip',
                     'application/java-archive',
                     'application/octet-stream',
-                    'binary',
-            ):
+                    'binary', ):
 
                 if has_extension(fp, 'apk'):
                     removeproblem('APK file', fd, fp)
@@ -1803,8 +1802,7 @@ def remove_signing_keys(build_dir):
                 'project.properties',
                 'build.properties',
                 'default.properties',
-                'ant.properties',
-        ]:
+                'ant.properties', ]:
             if propfile in files:
                 path = os.path.join(root, propfile)
 

From 3b3d026ee3148b41372245c3a6dddf16b99f4e3b Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 20 Jan 2015 22:40:45 +0100
Subject: [PATCH 2/3] fix install test by making sure common.options is set

---
 tests/install.TestCase | 1 +
 1 file changed, 1 insertion(+)

diff --git a/tests/install.TestCase b/tests/install.TestCase
index fcedb959..f0a6a968 100755
--- a/tests/install.TestCase
+++ b/tests/install.TestCase
@@ -40,6 +40,7 @@ if __name__ == "__main__":
     parser.add_option("-v", "--verbose", action="store_true", default=False,
                       help="Spew out even more information than normal")
     (fdroidserver.install.options, args) = parser.parse_args(['--verbose'])
+    fdroidserver.common.options = fdroidserver.install.options
 
     newSuite = unittest.TestSuite()
     newSuite.addTest(unittest.makeSuite(InstallTest))

From 2a87ae51278f590453cbab6adc15db79bfd1dc97 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Tue, 20 Jan 2015 22:43:55 +0100
Subject: [PATCH 3/3] fix update.TestCase: remove unused SilentPopen import,
 that class was removed

---
 tests/update.TestCase | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/update.TestCase b/tests/update.TestCase
index 88b429fa..c5f4a4c8 100755
--- a/tests/update.TestCase
+++ b/tests/update.TestCase
@@ -18,7 +18,7 @@ if localmodule not in sys.path:
 
 import fdroidserver.common
 import fdroidserver.update
-from fdroidserver.common import FDroidPopen, SilentPopen
+from fdroidserver.common import FDroidPopen
 
 class UpdateTest(unittest.TestCase):
     '''fdroid update'''