mirror of
https://gitlab.com/fdroid/fdroidserver.git
synced 2024-11-10 17:30:11 +01:00
Funambol output version checking got broken at some point - fixed
This commit is contained in:
parent
b882e2cceb
commit
9e582e9bfb
2
build.py
2
build.py
@ -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],
|
||||||
|
Loading…
Reference in New Issue
Block a user