Only set Auto Name if one isn't set already

diff --git a/fdroidserver/checkupdates.py b/fdroidserver/checkupdates.py
index 97b7b7e16e239dabeac82eae76d7ede95fb74b51..25a8f3cfc201b471d588738681a6fc899b3e5c00 100644 (file)
--- a/fdroidserver/checkupdates.py
+++ b/fdroidserver/checkupdates.py
@@ -2,7 +2,7 @@
 # -*- coding: utf-8 -*-
 #
 # checkupdates.py - part of the FDroid server tools
-# Copyright (C) 2010-13, Ciaran Gultnieks, ciaran@ciarang.com
+# Copyright (C) 2010-2015, Ciaran Gultnieks, ciaran@ciarang.com
 # Copyright (C) 2013-2014 Daniel Martí <mvdan@mvdan.cc>
 #
 # This program is free software: you can redistribute it and/or modify
@@ -353,17 +353,17 @@ def fetch_autoname(app, tag):
         if app['builds'][-1]['gradle']:
             flavours = app['builds'][-1]['gradle']
 
-    logging.debug("...fetch auto name from " + app_dir)
-    new_name = common.fetch_real_name(app_dir, flavours)
-    commitmsg = None
-    if new_name:
-        logging.debug("...got autoname '" + new_name + "'")
-        if new_name != app['Auto Name']:
+    if not app['Auto Name']:
+        logging.debug("...fetch auto name from " + app_dir)
+        new_name = common.fetch_real_name(app_dir, flavours)
+        commitmsg = None
+        if new_name:
+            logging.debug("...got autoname '" + new_name + "'")
             app['Auto Name'] = new_name
             if not commitmsg:
                 commitmsg = "Set autoname of {0}".format(common.getappname(app))
-    else:
-        logging.debug("...couldn't get autoname")
+        else:
+            logging.debug("...couldn't get autoname")
 
     if app['Current Version'].startswith('@string/'):
         cv = common.version_name(app['Current Version'], app_dir, flavours)