mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-11-08 00:10:29 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
David Black 2012-12-15 15:29:21 +00:00
commit ed78943692
3 changed files with 7 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

2
buildserver/cookbooks/fdroidbuild-general/recipes/default.rb
View file

@ -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

7
fdroidserver/update.py
View file

@ -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"

2
wp-fdroid/wp-fdroid.php
View file

@ -294,7 +294,7 @@ class FDroid
$out.="<p><b>NOTE:</b> 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.</p>";