Remove UCM:Market

diff --git a/docs/fdroid.texi b/docs/fdroid.texi
index ff4861c89e8a6aade3a95a240aaaa1076e407a68..094dad62845969ca48d7e7913b9267d256a0bdf1 100644 (file)
--- a/docs/fdroid.texi
+++ b/docs/fdroid.texi
@@ -1064,14 +1064,6 @@ Despite these caveats, it is the often the favourite update check mode.
 
 It currently only works for git and git-svn repositories. In the case of the
 latter, the repo URL must encode the path to the trunk and tags.
-@item
-@code{Market} - This is being phased out and should only be used when the other
-automatic modes don't work. It won't work if the developer deploys multiple 
-apks to Google Play; if the current version does not have more than one 
-review; or if the package has been abandoned in favour of another. 
-Nevertheless, it can often be helpful to consult Google Play for version 
-information when checking the validity of the current version obtained via 
-RepoManifest.
 @end itemize
 
 @node Auto Update Mode

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index d030f4a61d1536096296b8b1fa96c3adfd3a2fc2..db2f19e062e2d16e55aa510eaabe6061a900bf81 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -195,7 +195,6 @@ def check_market(app):
         return (None, 'Failed:' + str(e))
 
     version = None
-    vercode = None
 
     m = re.search('itemprop="softwareVersion">[ ]*([^<]+)[ ]*</div>', page)
     if m:
@@ -205,16 +204,9 @@ def check_market(app):
     if version == 'Varies with device':
         return (None, 'Device-variable version, cannot use this method')
 
-    m = re.search('data-paramValue="(\d+)"><div class="goog-menuitem-content">Latest Version<', page)
-    if m:
-        vercode = m.group(1)
-
-    if not vercode:
-        return (None, "Couldn't find version code")
     if not version:
         return (None, "Couldn't find version")
-    return (version, str(int(vercode)))
-
+    return (version, None)
 
 
 def main():
@@ -262,9 +254,7 @@ def main():
             logmsg = None
 
             mode = app['Update Check Mode']
-            if mode == 'Market':
-                (version, vercode) = check_market(app)
-            elif mode == 'Tags':
+            if mode == 'Tags':
                 (version, vercode) = check_tags(app, sdk_path)
             elif mode == 'RepoManifest':
                 (version, vercode) = check_repomanifest(app, sdk_path)