From ca341bb1706575a32b2bfcc9445d594884930180 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Wed, 19 Sep 2012 14:01:59 +0100 Subject: [PATCH 1/2] Fix external link formatting --- fdroidserver/common.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fdroidserver/common.py b/fdroidserver/common.py index 40f2483e..e7b62c9d 100644 --- a/fdroidserver/common.py +++ b/fdroidserver/common.py @@ -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 += '' + cgi.escape(urltxt) + '' linkified_plain += urltxt if urltxt != url: From bbfb472fe5be03cb2f62f1a5658dea016ef11ca2 Mon Sep 17 00:00:00 2001 From: Ciaran Gultnieks Date: Thu, 20 Sep 2012 10:27:33 +0100 Subject: [PATCH 2/2] Added android-12 to build server --- buildserver/cookbooks/android-sdk/recipes/default.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildserver/cookbooks/android-sdk/recipes/default.rb b/buildserver/cookbooks/android-sdk/recipes/default.rb index 0a905dc6..23a1f902 100644 --- a/buildserver/cookbooks/android-sdk/recipes/default.rb +++ b/buildserver/cookbooks/android-sdk/recipes/default.rb @@ -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"