diff --git a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb index be3679e0..07a4ca52 100644 --- a/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb +++ b/buildserver/cookbooks/fdroidbuild-general/recipes/default.rb @@ -1,5 +1,5 @@ -%w{ant ant-contrib autoconf bison libtool libssl libssl-dev maven javacc python git-core mercurial subversion bzr git-svn make perlmagick}.each do |pkg| +%w{ant ant-contrib autoconf bison libtool libssl1.0.0 libssl-dev maven javacc python git-core mercurial subversion bzr git-svn make perlmagick zip}.each do |pkg| package pkg do action :install end diff --git a/fdroidserver/update.py b/fdroidserver/update.py index 3d9e6162..81e43c5b 100644 --- a/fdroidserver/update.py +++ b/fdroidserver/update.py @@ -168,8 +168,11 @@ def update_wiki(apps, apks, verbose=False): print "Checking " + pagename if not pagename in existingpages: print "Creating page " + pagename - newpage = site.Pages[pagename] - newpage.save(text, summary='Auto-created') + try: + newpage = site.Pages[pagename] + newpage.save(text, summary='Auto-created') + except: + print "...FAILED to create page" diff --git a/wp-fdroid/wp-fdroid.php b/wp-fdroid/wp-fdroid.php index 8a4dcedf..2fed1e1c 100644 --- a/wp-fdroid/wp-fdroid.php +++ b/wp-fdroid/wp-fdroid.php @@ -294,7 +294,7 @@ class FDroid $out.="

NOTE: Although APK downloads are available below to give "; $out.="you the choice, you should be aware that by installing that way you "; - $out.="will not receieve update notifications, and it's a less secure way "; + $out.="will not receive update notifications, and it's a less secure way "; $out.="to download, especially if you are not currently using HTTPS. "; $out.="We recommend that you install the F-Droid client and use that.

";