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

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

This commit is contained in:
David Black 2012-09-20 14:10:29 +01:00
commit 8640f4da03
2 changed files with 4 additions and 4 deletions

View File

@ -29,8 +29,8 @@ execute "add-android-sdk-path" do
not_if "grep #{sdk_loc} /home/#{user}/.bashrc"
end
%w{android-3 android-4 android-7 android-8 android-10
android-11 android-13 android-14 android-15 android-16}.each do |sdk|
%w{android-3 android-4 android-7 android-8 android-10 android-11
android-12 android-13 android-14 android-15 android-16}.each do |sdk|
script "add_sdk_#{sdk}" do
interpreter "bash"

View File

@ -704,13 +704,13 @@ class DescriptionFormatter:
index = txt.find("]")
if index == -1:
raise MetaDataException("Unterminated ]")
url = txt[2:index]
url = txt[1:index]
index2 = url.find(' ')
if index2 == -1:
urltxt = url
else:
urltxt = url[index2 + 1:]
url = url[:index]
url = url[:index2]
linkified_html += '<a href="' + url + '">' + cgi.escape(urltxt) + '</a>'
linkified_plain += urltxt
if urltxt != url: