From: Daniel Martí <mvdan@mvdan.cc>
Date: Tue, 1 Sep 2015 22:30:41 +0000 (-0700)
Subject: Even examples/config.py with default_config
X-Git-Tag: 0.5.0~135
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=91f36acaa60fd316ee24f7725a36eb28d791f92b;p=fdroidserver.git

Even examples/config.py with default_config
---

diff --git a/examples/config.py b/examples/config.py
index 427342be..e0acfd70 100644
--- a/examples/config.py
+++ b/examples/config.py
@@ -11,12 +11,12 @@
 # used by default.  If a version is missing or assigned to None, it is assumed
 # not installed.
 # ndk_paths = {
-#    'r9b': "/opt/android-ndk-r9b",
-#    'r10e': "/opt/android-ndk",
+#     'r9b': None,
+#     'r10e': "$ANDROID_NDK",
 # }
 
 # Build tools version to be used
-build_tools = "22.0.1"
+build_tools = "23.0.0"
 
 # Command or path to binary for running Ant
 ant = "ant"
@@ -214,13 +214,13 @@ carbon_port = 2003
 build_server_always = False
 
 # By default, fdroid will use YAML and the custom .txt metadata formats.  It
-# is also possible to have metadata in JSON and XML. You can enable your
-# preferred formats by setting them in a list:
-# accepted_formats = ['json', 'txt', 'xml', 'yaml']
+# is also possible to have metadata in JSON and XML by adding 'json' and
+# 'xml'.
+# accepted_formats = ['txt', 'yaml']
 
 # Limit in number of characters that fields can take up
 # Only the fields listed here are supported, defaults shown
 char_limits = {
-    'Summary': 50,
-    'Description': 1500,
+    'Summary': 80,
+    'Description': 4000,
 }
diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 0bc1eb5c..2cd4bdd2 100644
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -53,7 +53,7 @@ default_config = {
     'sdk_path': "$ANDROID_HOME",
     'ndk_paths': {
         'r9b': None,
-        'r10e': "$ANDROID_NDK"
+        'r10e': "$ANDROID_NDK",
     },
     'build_tools': "23.0.0",
     'ant': "ant",
@@ -75,7 +75,7 @@ default_config = {
     'smartcardoptions': [],
     'char_limits': {
         'Summary': 80,
-        'Description': 4000
+        'Description': 4000,
     },
     'keyaliases': {},
     'repo_url': "https://MyFirstFDroidRepo.org/fdroid/repo",