From: Ciaran Gultnieks <ciaran@ciarang.com>
Date: Thu, 15 Mar 2012 16:37:51 +0000 (+0000)
Subject: Merge commit 'refs/merge-requests/88' of git://gitorious.org/f-droid/fdroidserver... 
X-Git-Tag: 0.1~822
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=b6c46d5ddc17d01358dff766da9b5762a9f3a752;p=fdroidserver.git

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

Conflicts:
	fdroidserver/build.py
---

b6c46d5ddc17d01358dff766da9b5762a9f3a752
diff --cc fdroidserver/build.py
index 718ad079,f46f6c7d..755adc1e
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@@ -240,9 -240,9 +240,9 @@@ def build_local(app, thisbuild, vcs, bu
  
      if (version != thisbuild['version'] or
              vercode != thisbuild['vercode']):
-         raise BuildException(("Unexpected version/version code in output"
-                              "APK: %s / %s, "
-                              "Expected: %s / %s")
+         raise BuildException(("Unexpected version/version code in output;"
 -                             " APK: '%s' / '%s'"
++                             " APK: '%s' / '%s', "
+                              " Expected: '%s' / '%s'")
                               % (version, str(vercode), thisbuild['version'], str(thisbuild['vercode']))
                              )