Get rid of more unnecessary finds

diff --git a/fdroidserver/build.py b/fdroidserver/build.py
index e7fe559125f2e6865a50d3d0e2f9602bb2428c9c..f134178dd92c1d90dcdc766b8bfb573dbfeb395c 100644 (file)
--- a/fdroidserver/build.py
+++ b/fdroidserver/build.py
@@ -94,11 +94,11 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
             p = subprocess.Popen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'list', '--details'],
                 cwd='builder', stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
             output = p.communicate()[0]
-            if output.find('fdroidclean') != -1:
+            if 'fdroidclean' in output:
                 if options.verbose:
                     print "...snapshot exists - resetting build server to clean state"
                 retcode, output = vagrant(['status'], cwd='builder')
-                if output.find('running') != -1:
+                if 'running' in output:
                     if options.verbose:
                         print "...suspending"
                     vagrant(['suspend'], cwd='builder')
@@ -186,7 +186,7 @@ def build_server(app, thisbuild, vcs, build_dir, output_dir, force):
         p = subprocess.Popen(['VBoxManage', 'snapshot', get_builder_vm_id(), 'list', '--details'],
             cwd='builder', stdout=subprocess.PIPE, stderr=subprocess.STDOUT)
         output = p.communicate()[0]
-        if output.find('fdroidclean') == -1:
+        if 'fdroidclean' not in output:
             raise BuildException("Failed to take snapshot.")
 
     try:

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 3b59ef4e2bacdab21dc8cfebd970b03da2043b3d..dc88c2dccaec62b8fa2243a7a56ad6e326e8bc37 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -31,6 +31,7 @@ from distutils.version import LooseVersion
 import common, metadata
 from common import BuildException
 from common import VCSException
+from metadata import MetaDataException
 
 
 # Check for a new version by looking at a document retrieved via HTTP.
@@ -413,9 +414,10 @@ def main():
             elif mode.startswith('Version '):
                 pattern = mode[8:]
                 if pattern.startswith('+'):
-                    o = pattern.find(' ')
-                    suffix = pattern[1:o]
-                    pattern = pattern[o + 1:]
+                    try:
+                        suffix, pattern = pattern.split(' ', 1)
+                    except ValueError:
+                        raise MetaDataException("Invalid AUM at: " + line)
                 else:
                     suffix = ''
                 gotcur = False

diff --git a/fdroidserver/update.py b/fdroidserver/update.py
index 93e1cccda9d75748cc0e689d3cd22148084ca3be..7d7612129cfce036c532cf37d85fad41494798de 100644 (file)
--- a/fdroidserver/update.py
+++ b/fdroidserver/update.py
@@ -307,7 +307,7 @@ def scan_apks(apps, apkcache, repodir, knownapks):
     for apkfile in glob.glob(os.path.join(repodir, '*.apk')):
 
         apkfilename = apkfile[len(repodir) + 1:]
-        if apkfilename.find(' ') != -1:
+        if ' ' in apkfilename:
             print "No spaces in APK filenames!"
             sys.exit(1)