From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Mon, 20 Jun 2011 22:14:38 +0000 (+0100)
Subject: Funambol output version checking got broken at some point - fixed
X-Git-Tag: 0.1~1356
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=9e582e9bfb1b62234d055f136ff49293c0a16bae;p=fdroidserver.git

Funambol output version checking got broken at some point - fixed
---

diff --git a/build.py b/build.py
index 22a0aab5..5f9e2196 100755
--- a/build.py
+++ b/build.py
@@ -471,6 +471,7 @@ for app in apps:
                     # Special case (again!) for funambol...
                     src = ("funambol-android-sync-client-" +
                             thisbuild['version'] + "-unsigned.apk")
+                    src = os.path.join(bindir, src)
                 elif thisbuild.has_key('maven'):
                     src = re.match(r".*^\[INFO\] Installing /.*/([^/]*)\.apk",
                             output, re.S|re.M).group(1)
@@ -483,6 +484,7 @@ for app in apps:
 
                 # By way of a sanity check, make sure the version and version
                 # code in our new apk match what we expect...
+                print "Checking " + src
                 p = subprocess.Popen([os.path.join(sdk_path, 'platform-tools',
                                                    'aapt'),
                                       'dump', 'badging', src],