Rename market to gplay

diff --git a/completion/bash-completion b/completion/bash-completion
index e409b03d75ecdc5b85d267cd9b6c061dd47412b4..748a7fa84fc187cbd4eda7cf684c682967323545 100644 (file)
--- a/completion/bash-completion
+++ b/completion/bash-completion
@@ -106,7 +106,7 @@ __complete_publish() {
 
 __complete_checkupdates() {
     opts="-h -v -p"
-    lopts="--help --verbose --package --auto --autoonly --commit --market"
+    lopts="--help --verbose --package --auto --autoonly --commit --gplay"
     case "${prev}" in
         -p|--package)
             __package

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 1b8c5c1a34bd67afce3141a9d5335ba389b71dcd..8b9d0dcc918bcc138090df19bd284d5632523d09 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -176,10 +176,10 @@ def check_repomanifest(app, sdk_path, branch=None):
         return (None, msg)
 
 
-# Check for a new version by looking at the Google market.
-# Returns (None, "a message") if this didn't work, or (version, vercode) for
+# Check for a new version by looking at the Google Play Store.
+# Returns (None, "a message") if this didn't work, or (version, None) for
 # the details of the current version.
-def check_market(app):
+def check_gplay(app):
     time.sleep(15)
     url = 'https://play.google.com/store/apps/details?id=' + app['id']
     headers = {'User-Agent' : 'Mozilla/5.0 (X11; Linux i686; rv:18.0) Gecko/20100101 Firefox/18.0'}
@@ -225,7 +225,7 @@ def main():
                       help="Only process apps with auto-updates")
     parser.add_option("--commit", action="store_true", default=False,
                       help="Commit changes")
-    parser.add_option("--market", action="store_true", default=False,
+    parser.add_option("--gplay", action="store_true", default=False,
                       help="Only print differences with the Play Store")
     (options, args) = parser.parse_args()
 
@@ -239,9 +239,9 @@ def main():
             print "No such package"
             sys.exit(1)
 
-    if options.market:
+    if options.gplay:
         for app in apps:
-            version, reason = check_market(app)
+            version, reason = check_gplay(app)
             if version is None and options.verbose:
                 if reason == '404':
                     print "%s (%s) is not in the Play Store" % (app['Auto Name'], app['id'])