Merge branch 'master' of git://gitorious.org/f-droid/fdroidserver

buildserver/Vagrantfile

@@ -3,7 +3,7 @@ Vagrant::Config.run do |config|
   config.vm.box = "precise32"
   config.vm.box_url = "/shares/software/OS and Boot/precise32.box"
 
-  config.vm.customize ["modifyvm", :id, "--memory", "1024"]
+  config.vm.customize ["modifyvm", :id, "--memory", "1536"]
 
   config.vm.provision :shell, :path => "fixpaths.sh"
   # Set apt proxy - remove, or adjust this, accordingly!

buildserver/cookbooks/android-sdk/recipes/default.rb

@@ -12,10 +12,10 @@ script "setup-android-sdk" do
   user user
   cwd "/tmp"
   code "
-    wget http://dl.google.com/android/android-sdk_r16-linux.tgz
-    tar zxvf android-sdk_r16-linux.tgz
+    wget http://dl.google.com/android/android-sdk_r21.0.1-linux.tgz
+    tar zxvf android-sdk_r21.0.1-linux.tgz
     mv android-sdk-linux #{sdk_loc}
-    rm android-sdk_r16-linux.tgz
+    rm android-sdk_r21.0.1-linux.tgz
     #{sdk_loc}/tools/android update sdk --no-ui -t platform-tool
     #{sdk_loc}/tools/android update sdk --no-ui -t tool
   "

fdroidserver/checkupdates.py

@@ -231,6 +231,12 @@ def main():
                 pass
             elif mode.startswith('Version '):
                 pattern = mode[8:]
+                if pattern.startswith('+'):
+                    o = pattern.find(' ')
+                    suffix = pattern[1:o]
+                    pattern = pattern[o + 1:]
+                else:
+                    suffix = ''
                 gotcur = False
                 latest = None
                 for build in app['builds']:
@@ -242,7 +248,7 @@ def main():
                     newbuild = latest.copy()
                     del newbuild['origlines']
                     newbuild['vercode'] = app['Current Version Code']
-                    newbuild['version'] = app['Current Version']
+                    newbuild['version'] = app['Current Version'] + suffix
                     print "...auto-generating build for " + newbuild['version']
                     commit = pattern.replace('%v', newbuild['version'])
                     commit = commit.replace('%c', newbuild['vercode'])

makebuildserver.py

@@ -23,7 +23,11 @@ if os.path.exists(boxfile):
 
 vagrant(['halt'], serverdir)
 print "Configuring build server VM"
-vagrant(['up'], serverdir)
+returncode, out, err = vagrant(['up'], serverdir)
+if returncode != 0:
+    print "Failed to configure server"
+    print out
+    print err
 print "Stopping build server VM"
 vagrant(['halt'], serverdir)