Regression - we won't do subvercodes

diff --git a/fdroidserver/common.py b/fdroidserver/common.py
index db2904f426929a54d38f9383257de55eee9b6c9c..f5158288a71cbf05eb537b2e4d04cf9ca5e299ca 100644 (file)
--- a/fdroidserver/common.py
+++ b/fdroidserver/common.py
@@ -465,19 +465,9 @@ def parse_metadata(metafile, **kw):
         thisbuild = {}
         thisbuild['origlines'] = lines
         thisbuild['version'] = parts[0]
-        ver = parts[1].split('-')
-        if len(ver) == 1:
-            thisbuild['vercode'] = parts[1]
-            thisbuild['subvercode'] = None
-        elif len(ver) == 2:
-            thisbuild['vercode'] = ver[0]
-            thisbuild['subvercode'] = ver[1]
-        else:
-            raise MetaDataException("Invalid version code for build in " + metafile.name)
+        thisbuild['vercode'] = parts[1]
         try:
             testvercode = int(thisbuild['vercode'])
-            if thisbuild['subvercode'] is not None:
-                testsubvercode = int(thisbuild['subvercode'])
         except:
             raise MetaDataException("Invalid version code for build in " + metafile.name)
         thisbuild['commit'] = parts[2]
@@ -635,9 +625,7 @@ def parse_metadata(metafile, **kw):
     return thisinfo
 
 def getvercode(build):
-    if build['subvercode'] is None:
-        return build['vercode']
-    return "%s-%s" % (build['vercode'], build['subvercode'])
+    return "%s" % (build['vercode'])
 
 def getapkname(app, build):
     return "%s_%s.apk" % (app['id'], getvercode(build))

diff --git a/fdroidserver/import.py b/fdroidserver/import.py
index 6d3aaade4db4aa1f7bcaed130c6ace88fb427ee0..a123193e0a0fc7aca70a2b3fdacc0e906d884a0c 100644 (file)
--- a/fdroidserver/import.py
+++ b/fdroidserver/import.py
@@ -264,7 +264,6 @@ def main():
     build = {}
     build['version'] = version
     build['vercode'] = vercode
-    build['subvercode'] = None
     build['commit'] = '?'
     if options.subdir:
         build['subdir'] = options.subdir