Error if UCM:Tags is used with git-svn without tags set up

[fdroidserver.git] / fdroidserver / checkupdates.py

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index ae185350bc378737784977248793f54b051de5d7..7ce1457510c1b35b6dd114a8ed99a22bca9c60c8 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -102,6 +102,9 @@ def check_tags(app, pattern):
         if repotype not in ('git', 'git-svn', 'hg', 'bzr'):
             return (None, 'Tags update mode only works for git, hg, bzr and git-svn repositories currently', None)
 
+        if repotype == 'git-svn' and ';' not in app['Repo']:
+            return (None, 'Tags update mode used in git-svn, but the repo was not set up with tags', None)
+
         # Set up vcs interface and make sure we have the latest code...
         vcs = common.getvcs(app['Repo Type'], app['Repo'], build_dir)
 
@@ -491,7 +494,8 @@ def main():
 
                 if not gotcur:
                     newbuild = latest.copy()
-                    del newbuild['origlines']
+                    if 'origlines' in newbuild:
+                        del newbuild['origlines']
                     newbuild['disable'] = False
                     newbuild['vercode'] = app['Current Version Code']
                     newbuild['version'] = app['Current Version'] + suffix