mirrors/fdroidserver
1
0
Fork 0
mirror of https://github.com/f-droid/fdroidserver.git synced 2025-09-16 07:52:35 +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-09-20 14:10:29 +01:00
commit 8640f4da03
2 changed files with 4 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
buildserver/cookbooks/android-sdk/recipes/default.rb
View file

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

4
fdroidserver/common.py
View file

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