1
0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-04 14:30:11 +01:00

Merge commit 'refs/merge-requests/88' of git://gitorious.org/f-droid/fdroidserver into merge-requests/88

Conflicts:
	fdroidserver/build.py
This commit is contained in:
Ciaran Gultnieks 2012-03-15 16:37:51 +00:00
commit b6c46d5ddc

View File

@ -240,9 +240,9 @@ def build_local(app, thisbuild, vcs, build_dir, output_dir, extlib_dir, tmp_dir,
if (version != thisbuild['version'] or if (version != thisbuild['version'] or
vercode != thisbuild['vercode']): vercode != thisbuild['vercode']):
raise BuildException(("Unexpected version/version code in output" raise BuildException(("Unexpected version/version code in output;"
"APK: %s / %s, " " APK: '%s' / '%s', "
"Expected: %s / %s") " Expected: '%s' / '%s'")
% (version, str(vercode), thisbuild['version'], str(thisbuild['vercode'])) % (version, str(vercode), thisbuild['version'], str(thisbuild['vercode']))
) )