mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-05 15:00:30 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Funambol output version checking got broken at some point - fixed

Browse source
This commit is contained in:
Ciaran Gultnieks 2011-06-20 23:14:38 +01:00
parent b882e2cceb
commit 9e582e9bfb
1 changed files with 2 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

2
build.py
View file

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