Don't need legacy disabled build handling everywhere now

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index a2ca3cf824dc3decc8f694e0a859b498eef9f089..82b8dc22e8d2216ceb0f505992cc945888b515c8 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -681,7 +681,7 @@ def trybuild(app, thisbuild, build_dir, output_dir, also_check_dir, srclib_dir,
             if os.path.exists(dest_also):
                 return False
 
-    if thisbuild['commit'].startswith('!') or 'disable' in thisbuild:
+    if 'disable' in thisbuild:
         return False
 
     print "Building version " + thisbuild['version'] + ' of ' + app['id']

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index 22dc70c338f7a5540d18c4efe0fd031a05f6d87f..9732ceb07d650a897c985abb43c89c6cc8e6481a 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -475,7 +475,7 @@ def parse_metadata(metafile, verbose=False):
         if parts[2].startswith('!'):
             # For backwards compatibility, handle old-style disabling,
             # including attempting to extract the commit from the message
-            thisbuild['disabled'] = parts[2]
+            thisbuild['disable'] = parts[2]
             commit = 'unknown - see disabled'
             index = parts[2].rfind('at ')
             if index != -1:
@@ -757,7 +757,7 @@ def write_metadata(dest, app, verbose=False):
 
         # This defines the preferred order for the build items - as in the
         # manual, they're roughly in order of application.
-        keyorder = ['disabled', 'commit', 'subdir', 'submodules', 'init',
+        keyorder = ['disable', 'commit', 'subdir', 'submodules', 'init',
                     'oldsdkloc', 'target', 'compilesdk', 'update',
                     'encoding', 'forceversion', 'forcevercode', 'rm',
                     'fixtrans', 'fixapos', 'extlibs', 'srclibs',

diff --git a/fdroidserver/scanner.py b/fdroidserver/scanner.py
index 2b62e2131b6b1be1e161f5d0149a05db03f65d8f..22874934f9702ec0d8407edac92faf7f777d34a1 100644 (file)
--- a/fdroidserver/scanner.py
+++ b/fdroidserver/scanner.py
@@ -86,7 +86,7 @@ def main():
 
                 for thisbuild in app['builds']:
 
-                    if thisbuild['commit'].startswith('!') or 'disable' in thisbuild:
+                    if 'disable' in thisbuild:
                         print ("..skipping version " + thisbuild['version'] + " - " +
                                 thisbuild.get('disable', thisbuild['commit'][1:]))
                     else:

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index ef31cae218de30a01e528f39aa1195c6de51d4d0..ac99b2acd376b0d4a7fb3330962b0da4879571ec 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -232,7 +232,7 @@ def delete_disabled_builds(apps, apkcache, repodirs):
     """
     for app in apps:
         for build in app['builds']:
-            if build['commit'].startswith('!') or 'disable' in build:
+            if 'disable' in build:
                 apkfilename = app['id'] + '_' + str(build['vercode']) + '.apk'
                 for repodir in repodirs:
                     apkpath = os.path.join(repodir, apkfilename)