From bb15611ed174cd68f177a977c10a9c0bd48c109e Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 2 Apr 2014 18:12:40 -0400
Subject: [PATCH 1/3] setup.py: include 'ssh' and 'mwclient' as required
 libraries

---
 setup.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index 2ea13f8c..9c771d30 100644
--- a/setup.py
+++ b/setup.py
@@ -27,8 +27,11 @@ setup(name='fdroidserver',
         ('fdroidserver/getsig', ['fdroidserver/getsig/getsig.class'])
         ],
       install_requires=[
-        'python-magic',
+        'mwclient',
+        'paramiko',
         'PIL',
+        'python-magic',
+        'ssh',
         ],
       classifiers=[
         'Development Status :: 3 - Alpha',

From 5b22e118722187529d78323e1540c7bf0b9215c6 Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 2 Apr 2014 18:32:41 -0400
Subject: [PATCH 2/3] make jenkins script use bash so we can use bashisms

---
 jenkins-build.sh => jenkins-build | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
 rename jenkins-build.sh => jenkins-build (99%)

diff --git a/jenkins-build.sh b/jenkins-build
similarity index 99%
rename from jenkins-build.sh
rename to jenkins-build
index ccd9492e..a5219f2f 100755
--- a/jenkins-build.sh
+++ b/jenkins-build
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 #
 # this is the script run by the Jenkins server to run the build and tests.  Be
 # sure to always run it in its dir, i.e. ./jenkins-build.sh, otherwise it might

From 9ece46d32f461cd124fa918f285d0b360bb5f22c Mon Sep 17 00:00:00 2001
From: Hans-Christoph Steiner <hans@eds.org>
Date: Wed, 2 Apr 2014 19:52:47 -0400
Subject: [PATCH 3/3] use the virtualenv python so pylint checks against its
 installed libs

---
 jenkins-build | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/jenkins-build b/jenkins-build
index a5219f2f..281aa1d4 100755
--- a/jenkins-build
+++ b/jenkins-build
@@ -76,11 +76,13 @@ set +e
 #   Module 'sys' has no '_MEIPASS' member
 # disable F0401 until there is a plugin to handle this properly:
 #   keysync-gui:25: [F] Unable to import 'ordereddict'
-pylint --output-format=parseable --reports=n \
+# use the virtualenv python so pylint checks against its installed libs
+python /usr/bin/pylint --output-format=parseable --reports=n \
     fdroidserver/*.py fdroid makebuildserver setup.py > $WORKSPACE/pylint.parseable
 
 # to only tell jenkins there was an error if we got ERROR or FATAL, uncomment these:
-#[ $(($? & 1)) = "1" ] && exit 1
-#[ $(($? & 2)) = "2" ] && exit 2
+[ $(($? & 1)) = "1" ] && echo "FATALs found"
+[ $(($? & 2)) = "2" ] && echo "ERRORs found"
+[ $(($? & 4)) = "4" ] && echo "WARNINGs found"
 set -e